Revert "Updated grml-debootstrap parameter handling"

[grml-debootstrap.git] / chroot-script

diff --git a/chroot-script b/chroot-script
index 75c6990..bb770a5 100755 (executable)
--- a/chroot-script
+++ b/chroot-script
@@ -131,7 +131,7 @@ EOF
 
 # remove now useless apt cache {{{
 remove_apt_cache() {
-    find /var/cache/apt/archives -name '*.deb' -exec rm -f '{}' \;
+  apt-get clean
 }
 # }}}
 
@@ -380,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:
@@ -441,9 +444,9 @@ trap signal_handler HUP INT QUIT TERM
  install_policy_rcd
 
  for i in chrootmirror grmlrepos kernelimg_conf \
-     remove_apt_cache 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