X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=chroot-script;h=fafe1bf1b2a7c3a60cce33cbab3ade2c7ed00eae;hb=bfe0feda5534b6bbd7069dd2ae063e28b6af8871;hp=7726ecd5f478307942bd25d3b9ade5b28238924d;hpb=4812ce411ed1a55de53c4c611d616d9b5149b9b4;p=grml-debootstrap.git

diff --git a/chroot-script b/chroot-script
index 7726ecd..fafe1bf 100755
--- a/chroot-script
+++ b/chroot-script
@@ -104,8 +104,8 @@ chrootmirror() {
 
   # add security.debian.org:
   case "$RELEASE" in
-    unstable|sid) ;;  # no security pool available
-    jessie|stretch|buster)
+    unstable|sid|stretch) ;;  # no security pool available
+    jessie|buster)
       echo "Adding security.debian.org to sources.list."
       echo "deb http://security.debian.org ${RELEASE}/updates $COMPONENTS" >> /etc/apt/sources.list
       ;;
@@ -479,7 +479,7 @@ EOF
     local rootfs_mount_options=""
 
     if [ -z "${FILESYSTEM}" ] ; then
-      FILESYSTEM="$(blkid -o value -s TYPE /dev/disk/by-uuid/"${TARGET_UUID}")"
+      FILESYSTEM="$(blkid -o value -s TYPE /dev/disk/by-uuid/"${TARGET_UUID}")" || true
     fi
 
     case "${FILESYSTEM}" in
@@ -495,8 +495,8 @@ EOF
   fi
 
 if [ -n "$EFI" ] ; then
-  # shellcheck disable=SC2086
-  echo "UUID=$(blkid -o value -s UUID $EFI)  /boot/efi       vfat    umask=0077      0       1" >> /etc/fstab
+  UUID_EFI="$(blkid -o value -s UUID "$EFI")"
+  echo "UUID=$UUID_EFI  /boot/efi       vfat    umask=0077      0       1" >> /etc/fstab
 fi
 
 cat >> /etc/fstab << EOF