From: Michael Prokop <mika@grml.org>
Date: Fri, 25 Nov 2022 13:32:00 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/pr/202'
X-Git-Tag: v0.101~2
X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=commitdiff_plain;h=7bab80c89ec11649062162119e0ba28d18e9fa58;hp=4c49de9d47fef1e743d87bd7bd08fd4ac7d36f9c

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

diff --git a/chroot-script b/chroot-script
index a033d8d..007792f 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