X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=bb770a515841e34fd75154bbf85aef8f08eb47ce;hp=f056f619cd04749068572ba56d34d40b3eefd6e4;hb=7cc268e168259a681c0244f9d73a28b7dc4d3769;hpb=10bd5c915d6e0fd7630a6d76b21d9872a9665702

diff --git a/chroot-script b/chroot-script
index f056f61..bb770a5 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
@@ -129,6 +129,12 @@ EOF
 }
 # }}}
 
+# remove now useless apt cache {{{
+remove_apt_cache() {
+  apt-get clean
+}
+# }}}
+
 # install additional packages {{{
 packages() {
   # Pre-seed the debconf database with answers. Each question will be marked
@@ -374,8 +380,11 @@ grub_config() {
      # 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
 
      # grub2:
@@ -399,7 +408,7 @@ 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
 }
@@ -417,15 +426,27 @@ finalize() {
 }
 # }}}
 
+# 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 {{{
 
  # 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   \
-     services ; do
+     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