X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=grml-debootstrap;h=739fd86d78a0e2d012165ecdc421ca8157e3d6d0;hp=7a71239a898cd74029455c6f3586fc75793e83ef;hb=f992b13b0e020e75dd4d6592f8d18f0ccafe9e5f;hpb=ccba9a85a1ad2e6aa405987195c1230e8a28c783 diff --git a/grml-debootstrap b/grml-debootstrap index 7a71239..739fd86 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 @@ -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] {{{