From: Michael Prokop <mika@grml.org>
Date: Fri, 25 Nov 2022 13:31:55 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/pr/201'
X-Git-Tag: v0.101~3
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=73829b0497532dfff79a0c23c3f39c7bfb83ea05;hp=8b44fbbb34301d28e9f4ff80516e90122748660c;p=grml-debootstrap.git

Merge remote-tracking branch 'origin/pr/201'
---

diff --git a/chroot-script b/chroot-script
index 101764d..498451f 100755
--- a/chroot-script
+++ b/chroot-script
@@ -479,11 +479,16 @@ createfstab(){
 EOF
 
   if [ -n "$TARGET_UUID" ] ; then
-    local rootfs_mount_options=",errors=remount-ro"
+    local rootfs_mount_options=""
+
+    if [ -z "${FILESYSTEM}" ] ; then
+      FILESYSTEM="$(blkid -o value -s TYPE /dev/disk/by-uuid/"${TARGET_UUID}")"
+    fi
+
     case "${FILESYSTEM}" in
-      f2fs)
-        # errors=remount-ro is unsupported, see https://github.com/grml/grml-debootstrap/issues/163
-        rootfs_mount_options=""
+      # errors=remount-ro is supported only by a few file systems
+      ext*|exfat|fat|jfs|nilfs2|vfat)
+        rootfs_mount_options=",errors=remount-ro"
         ;;
     esac