X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=bbd834f6b819b8d17a3502b269e54daf89f0c70c;hp=7a26927b0f75666de7e9bcaa780f6649e4423994;hb=c62dadf69387a747f3bb5f4e02ca1f62a9114382;hpb=cdb55b2de49391fd0efd940ce069302852216d8e

diff --git a/chroot-script b/chroot-script
index 7a26927..bbd834f 100755
--- a/chroot-script
+++ b/chroot-script
@@ -51,7 +51,7 @@ 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 || /bin/true
+     [ -n "$MIRROR" ] && echo "deb $MIRROR $RELEASE $COMPONENTS" >> /etc/apt/sources.list || true
   else
     if [ -n "$MIRROR" ] ; then
        echo "deb $MIRROR $RELEASE $COMPONENTS" > /etc/apt/sources.list
@@ -80,7 +80,7 @@ EOF
 
      # make sure we have the keys available for aptitude
      gpg --keyserver subkeys.pgp.net --recv-keys F61E2E7CECDEA787
-     gpg --export F61E2E7CECDEA787 | apt-key add - || /bin/true # not yet sure
+     gpg --export F61E2E7CECDEA787 | apt-key add - || true # not yet sure
      # why it's necessary, sometimes we get an error even though it works [mika]
 
      # make sure we install packages from grml's pool only if not available
@@ -116,15 +116,6 @@ EOF
 }
 # }}}
 
-# create default devices {{{
-makedev() {
-  if ! [ -r /dev/hda20 ] ; then
-     echo "Creating generic devices in /dev - this might take a while..."
-     cd /dev && MAKEDEV generic
-  fi
-}
-# }}}
-
 # make sure services do not start up {{{
 install_policy_rcd() {
   if ! [ -r /usr/sbin/policy-rc.d ] ; then
@@ -138,6 +129,17 @@ EOF
 }
 # }}}
 
+# remove now useless apt cache {{{
+remove_apt_cache() {
+  if [ "$RM_APTCACHE" = 'yes' ] ; then
+    echo "Cleaning apt cache."
+    apt-get clean
+  else
+    echo "Not cleaning apt cache as \$RM_APTCACHE is unset."
+  fi
+}
+# }}}
+
 # install additional packages {{{
 packages() {
   # Pre-seed the debconf database with answers. Each question will be marked
@@ -172,14 +174,6 @@ extrapackages() {
 }
 # }}}
 
-#  sarge specific stuff: mkinitrd {{{
-mkinitrd() {
-  if [ "$RELEASE" = 'sarge' ] ; then
-     sed -i "s#ROOT=probe#ROOT=$TARGET#" /etc/mkinitrd/mkinitrd.conf
-  fi
-}
-# }}}
-
 # install kernel packages {{{
 kernel() {
   # do not override $KERNEL if set via config file
@@ -193,13 +187,9 @@ kernel() {
 
   if [ -n "$KERNEL" ] ; then
      $APTUPDATE
-     if [ "$RELEASE" = 'sarge' ] ; then
-        KERNELPACKAGES="kernel-image-$KERNEL kernel-headers-$KERNEL"
-     else
-        # note: install busybox to be able to debug initramfs
-        KERNELPACKAGES="linux-image-$KERNEL linux-headers-$KERNEL busybox"
-     fi
-      DEBIAN_FRONTEND=$DEBIAN_FRONTEND $APTINSTALL $KERNELPACKAGES
+     # note: install busybox to be able to debug initramfs
+     KERNELPACKAGES="linux-image-$KERNEL linux-headers-$KERNEL busybox"
+     DEBIAN_FRONTEND=$DEBIAN_FRONTEND $APTINSTALL $KERNELPACKAGES
   fi
 }
 # }}}
@@ -379,64 +369,31 @@ initrd() {
 
   # generate initrd
   if [ -n "$INITRD" ] ; then
-     if [ "$RELEASE" = 'sarge' ] ; then
-        echo "Release sarge detected, will not create an initrd."
-     else
-        echo "Generating initrd."
-        update-initramfs -c -t -k $KERNELVER
-        if [ -f "/boot/initrd.img-$KERNELVER" ] ; then
-           GRUBINITRD="initrd          /boot/initrd.img-$KERNELVER"
-           LILOINITRD="        initrd=/boot/initrd.img-$KERNELVER"
-        fi
-     fi
+     echo "Generating initrd."
+     update-initramfs -c -t -k $KERNELVER
   fi
 }
 # }}}
 
 # grub configuration/installation {{{
-grub() {
-  if [ -z "$GROOT" ] ; then
-     echo "Warning: \$GROOT is not defined, will not adjust grub configuration therefore."
+grub_config() {
+  if [ -z "$GRUB" ] ; then
+     echo "Warning: \$GRUB is not defined, will not adjust grub configuration therefore."
   else
-     echo "Adjusting grub configuration for use on ${GROOT}."
-
-     # copy stage-files to /boot/grub/
-     [ -d /boot/grub/ ] || mkdir /boot/grub
-     # i386 specific:
-     [ -d /usr/lib/grub/i386-pc ]   && cp /usr/lib/grub/i386-pc/* /boot/grub/
-     # amd64 specific:
-     [ -d /usr/lib/grub/x86_64-pc ] && cp /usr/lib/grub/x86_64-pc/* /boot/grub/
-     # sarge ships grub files in another directory
-     [ "$RELEASE" = 'sarge' ]       && cp /lib/grub/i386-pc/* /boot/grub/
+     echo "Adjusting grub configuration for use on ${GRUB}."
 
      # finally install grub
      if [ -x /usr/sbin/update-grub ] ; then
         UPDATEGRUB='/usr/sbin/update-grub'
-     else
+     elif [ -x /sbin/update-grub ] ; then
         UPDATEGRUB='/sbin/update-grub'
+     else
+       echo "Error: update-grub not available, can not execute it."
+       return 1
      fi
-     $UPDATEGRUB -y
-
-     if [ -f /boot/grub/menu.lst ] ; then
-        sed -i "s/^# groot=.*/# groot=(${GROOT})/g" /boot/grub/menu.lst
-        case "$TARGET" in
-             # do NOT use uuid with SW-RAID
-             /dev/md*)
-               sed -i "s|^# kopt=root=.*|# kopt=root=${TARGET} ro ${BOOT_APPEND}|g" /boot/grub/menu.lst
-               ;;
-             *)
-               if [ -n "$TARGET_UUID" ] ; then
-                 sed -i "s|^# kopt=root=.*|# kopt=root=UUID=${TARGET_UUID} ro ${BOOT_APPEND}|g" /boot/grub/menu.lst
-               else
-                 sed -i "s|^# kopt=root=.*|# kopt=root=${TARGET} ro ${BOOT_APPEND}|g" /boot/grub/menu.lst
-               fi
-               ;;
-        esac
-
-        # not sure why savedefault does not work for me; any ideas?
-        sed -i "s/^savedefault.*/# &/g" /boot/grub/menu.lst
-        $UPDATEGRUB -y
-     fi
+
+     # grub2:
+     $UPDATEGRUB
   fi
 }
 # }}}
@@ -456,28 +413,44 @@ custom_scripts() {
 services() {
   for service in ssh mdadm mdadm-raid ; do
     if [ -x /etc/init.d/"$service" ] ; then
-       /etc/init.d/"$service" stop || /bin/true
+       /etc/init.d/"$service" stop || true
     fi
   done
 }
 # }}}
 
-# unmount all filesystems in chroot, make sure nothing is left {{{
+# unmount /proc and make sure nothing is left {{{
 finalize() {
   # make sure we don't leave any sensible data
   rm -f /etc/debootstrap/variables
+
   [ -n "$POLICYRCD" ] && rm -f /usr/sbin/policy-rc.d
-  umount -a    1>/dev/null 2>/dev/null || true
-  umount /proc 1>/dev/null 2>/dev/null || true
-  umount /proc 1>/dev/null 2>/dev/null || true
-  umount -a    1>/dev/null 2>/dev/null || true
+
+  umount /proc >/dev/null 2>/dev/null || true
 }
 # }}}
 
+# signal handler {{{
+signal_handler() {
+  finalize
+  [ -n "$1" ] && EXIT="$1" || EXIT="1"
+  exit "$EXIT"
+}
+# }}}
+
+# set signal handler {{{
+trap signal_handler HUP INT QUIT TERM
+# }}}
+
 # execute the functions {{{
- for i in chrootmirror grmlrepos kernelimg_conf makedev install_policy_rcd \
-     kernel packages extrapackages mkinitrd reconfigure hosts interfaces   \
-     timezone fstab hostname initrd grub passwords custom_scripts services ; do
+
+ # always execute install_policy_rcd
+ install_policy_rcd
+
+ for i in chrootmirror grmlrepos kernelimg_conf \
+     kernel packages extrapackages  reconfigure hosts interfaces \
+     timezone fstab hostname initrd grub_config passwords        \
+     custom_scripts remove_apt_cache services ; do
      if stage $i ; then
        $i && stage $i done || exit 1
      fi