X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=grml-debootstrap;h=add5973df8356d08923fe1c7b2d4044c8dbb2df7;hb=9d3d53815af22205fb4ba15419c254f21d410a19;hp=7a71239a898cd74029455c6f3586fc75793e83ef;hpb=ccba9a85a1ad2e6aa405987195c1230e8a28c783;p=grml-debootstrap.git

diff --git a/grml-debootstrap b/grml-debootstrap
index 7a71239..add5973 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -205,8 +205,11 @@ cleanup() {
   if [ -n "$MNTPOINT" ] ; then
     if grep -q "$MNTPOINT" /proc/mounts ; then
       # make sure nothing is left inside chroot so we can unmount it
-      [ -x "$MNTPOINT"/etc/init.d/ssh   ] && "$MNTPOINT"/etc/init.d/ssh stop
-      [ -x "$MNTPOINT"/etc/init.d/mdadm ] && "$MNTPOINT"/etc/init.d/mdadm stop
+      for service in ssh mdadm ; do
+        if [ -x "${MNTPOINT}/etc/init.d/${service}" ] ; then
+          chroot "$MNTPOINT" "/etc/init.d/${service}" stop
+        fi
+      done
 
       [ -x "$MNTPOINT"/bin/umount ] && chroot "$MNTPOINT" umount -a >/dev/null 2>&1
 
@@ -375,7 +378,7 @@ fi
 
 # make sure we have what we need {{{
 if [ -n "$VIRTUAL" ] ; then
-  check4progs kpartx mksh parted qemu-img || bailout 1
+  check4progs grub-mkimage kpartx mksh parted qemu-img || bailout 1
 fi
 # }}}
 
@@ -821,6 +824,14 @@ if [ "$CURRENT_ARCH" != "x86_64" ] ; then
 fi
 # }}}
 
+# Support for generic release codenames is unavailable. {{{
+if [ "$RELEASE" = "stable" ] || [ "$RELEASE" = "testing" ] ; then
+   eerror "Generic release codenames (stable, testing) are unsupported. \
+Please use specific codenames such as lenny, squeeze, wheezy or jessie." ; eend 1
+   bailout 1
+fi
+# }}}
+
 checkconfiguration
 
 # finally make sure at least $TARGET is set [the partition for the new system] {{{