X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=grml-debootstrap;h=0a752e78dd648db1fb424a37d43042d67cad40c1;hb=52e9bbf991bfa13efc940f00fd4fedbaa87f696f;hp=c029246720d699059329b443bd5a9091c9de1ea3;hpb=6dde1bdbf1ffab952beded7a4900b1264429ac47;p=grml-debootstrap.git

diff --git a/grml-debootstrap b/grml-debootstrap
index c029246..0a752e7 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
 
@@ -430,7 +433,10 @@ prompt_for_target()
   fi
 
   PARTITION_LIST=$(for i in $AVAILABLE_PARTITIONS ; do
-                     echo "$i $(blkid -s TYPE -o value "$i" 2>/dev/null || echo '[no_filesystem_yet]')"
+                     fs="$(blkid -s TYPE -o value "$i" 2>/dev/null)"
+                     [ -n "$fs" ] || fs='[no_filesystem_yet]'
+                     echo "$i" "$fs"
+                     unset fs
                    done)
 
   TARGET=$(dialog --title "$PN" --single-quoted --stdout \