Improve installed-check for packages that should be reconfigured.

[grml-debootstrap.git] / chroot-script

diff --git a/chroot-script b/chroot-script
index 21d0c92..20a1cb0 100755 (executable)
--- a/chroot-script
+++ b/chroot-script
@@ -20,7 +20,7 @@ if [ -x /usr/bin/aptitude ] ; then
    APTINSTALL="aptitude -y --without-recommends install $DPKG_OPTIONS"
    APTUPDATE='aptitude update'
 else
-   APTINSTALL="apt-get --force-yes -y install $DPKG_OPTIONS"
+   APTINSTALL="apt-get --force-yes -y --no-install-recommends install $DPKG_OPTIONS"
    APTUPDATE='apt-get update'
 fi
 
@@ -61,9 +61,23 @@ chrootmirror() {
   if [ -n "$ISO" ] ; then
      echo "deb $ISO $RELEASE $COMPONENTS" > /etc/apt/sources.list
      [ -n "$MIRROR" ] && echo "deb $MIRROR $RELEASE $COMPONENTS" >> /etc/apt/sources.list || true
+     # add security.debian.org:
+     case "$RELEASE" in
+       unstable|sid) ;;  # no security pool available
+       *)
+         echo "deb http://security.debian.org ${RELEASE}/updates $COMPONENTS" >> /etc/apt/sources.list
+         ;;
+     esac
   else
     if [ -n "$MIRROR" ] ; then
        echo "deb $MIRROR $RELEASE $COMPONENTS" > /etc/apt/sources.list
+       # add security.debian.org:
+       case "$RELEASE" in
+         unstable|sid) ;;  # no security pool available
+         *)
+           echo "deb http://security.debian.org ${RELEASE}/updates $COMPONENTS" >> /etc/apt/sources.list
+           ;;
+       esac
     fi
   fi
 }
@@ -202,7 +216,7 @@ kernel() {
   if [ -n "$KERNEL" ] ; then
      $APTUPDATE
      # note: install busybox to be able to debug initramfs
-     KERNELPACKAGES="linux-image-$KERNEL linux-headers-$KERNEL busybox"
+     KERNELPACKAGES="linux-image-$KERNEL linux-headers-$KERNEL busybox firmware-linux"
      DEBIAN_FRONTEND=$DEBIAN_FRONTEND $APTINSTALL $KERNELPACKAGES
   fi
 }
@@ -212,9 +226,10 @@ kernel() {
 reconfigure() {
   if [ -n "$RECONFIGURE" ] ; then
      for package in $RECONFIGURE ; do
-         dpkg --list $package 1>/dev/null 2>/dev/null && \
-         DEBIAN_FRONTEND=$DEBIAN_FRONTEND dpkg-reconfigure $package || \
-         echo "Warning: $package does not exist, can not reconfigure it."
+         if dpkg --list $package >/dev/null 2>&1 | grep '^ii' ; then
+           DEBIAN_FRONTEND=$DEBIAN_FRONTEND dpkg-reconfigure $package || \
+           echo "Warning: $package does not exist, can not reconfigure it."
+         fi
      done
   fi
 }
@@ -394,25 +409,42 @@ initrd() {
 # }}}
 
 # grub configuration/installation {{{
-grub_config() {
+grub_install() {
+
   if [ -z "$GRUB" ] ; then
-     echo "Warning: \$GRUB is not defined, will not adjust grub configuration therefore."
+     echo "Notice: \$GRUB not defined, will not install grub therefore."
+     return 0
+  fi
+
+  if ! [ -x "$(which grub-install)" ] ; then
+     echo "Error: grub-install not available. (Error while installing grub package?)" >&2
+     return 1
+  fi
+
+  if [ -n "$SELECTED_PARTITIONS" ] ; then # using sw-raid
+     for device in $SELECTED_PARTITIONS ; do
+        GRUB="${device%%[0-9]}"
+        echo "Installing grub on ${GRUB}:"
+        grub-install --no-floppy "$GRUB"
+     done
   else
-     echo "Adjusting grub configuration for use on ${GRUB}."
+     echo "Installing grub on ${GRUB}:"
+     grub-install --no-floppy "$GRUB"
+  fi
 
-     # finally install grub
-     if [ -x /usr/sbin/update-grub ] ; then
-        UPDATEGRUB='/usr/sbin/update-grub'
-     elif [ -x /sbin/update-grub ] ; then
-        UPDATEGRUB='/sbin/update-grub'
-     else
-       echo "Error: update-grub not available, can not execute it."
-       return 1
-     fi
+  echo "Adjusting grub configuration for use on ${GRUB}."
 
-     # grub2:
-     $UPDATEGRUB
+  # finally install grub
+  if [ -x /usr/sbin/update-grub ] ; then
+     UPDATEGRUB='/usr/sbin/update-grub'
+  elif [ -x /sbin/update-grub ] ; then
+     UPDATEGRUB='/sbin/update-grub'
+  else
+    echo "Error: update-grub not available, can not execute it." >&2
+    return 1
   fi
+
+  $UPDATEGRUB
 }
 # }}}
 
@@ -467,7 +499,7 @@ trap signal_handler HUP INT QUIT TERM
 
  for i in chrootmirror grmlrepos kernelimg_conf \
      kernel packages extrapackages  reconfigure hosts interfaces \
-     timezone fstab hostname initrd grub_config passwords        \
+     timezone fstab hostname initrd grub_install passwords        \
      custom_scripts remove_apt_cache services ; do
      if stage $i ; then
        $i && stage $i done || exit 1