X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=f20faf0a4aad247d6d15eb784498e50b24d23e4b;hp=d1bdb958d9c73b2e26999375d2f88c64400aa72a;hb=8463f68fd13aa54a76d31f3883d7c38d5adfb8cf;hpb=147838d5fdc817ed26f1cf3e465dddd966356870

diff --git a/chroot-script b/chroot-script
index d1bdb95..f20faf0 100755
--- a/chroot-script
+++ b/chroot-script
@@ -131,7 +131,12 @@ EOF
 
 # remove now useless apt cache {{{
 remove_apt_cache() {
-  apt-get clean
+  if [ "$RM_APTCACHE" = 'yes' ] ; then
+    echo "Cleaning apt cache."
+    apt-get clean
+  else
+    echo "Not cleaning apt cache as \$RM_APTCACHE is unset."
+  fi
 }
 # }}}
 
@@ -380,8 +385,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:
@@ -441,9 +449,9 @@ trap signal_handler HUP INT QUIT TERM
  install_policy_rcd
 
  for i in chrootmirror grmlrepos kernelimg_conf \
-     kernel packages extrapackages remove_apt_cache 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