- echo "Setting up /etc/fstab"
-if [ -n "$TARGET_UUID" ] ; then
- echo "/dev/disk/by-uuid/${TARGET_UUID} / auto defaults,errors=remount-ro 0 1" > /etc/fstab
-else
- echo "${TARGET} / auto defaults,errors=remount-ro 0 1" > /etc/fstab
+ echo "Setting up /etc/fstab"
+ cat > /etc/fstab <<EOF
+# /etc/fstab - created by grml-debootstrap on $(date)
+# Accessible filesystems, by reference, are maintained under '/dev/disk/'.
+# See man pages fstab(5), findfs(8), mount(8) and/or blkid(8) for more info.
+#
+# After editing this file, run 'systemctl daemon-reload' to update systemd
+# units generated from this file.
+#
+EOF
+
+ if [ -n "$TARGET_UUID" ] ; then
+ local rootfs_mount_options=""
+
+ if [ -z "${FILESYSTEM}" ] ; then
+ FILESYSTEM="$(blkid -o value -s TYPE /dev/disk/by-uuid/"${TARGET_UUID}")" || true
+ fi
+
+ case "${FILESYSTEM}" in
+ # errors=remount-ro is supported only by a few file systems
+ ext*|exfat|fat|jfs|nilfs2|vfat)
+ rootfs_mount_options=",errors=remount-ro"
+ ;;
+ esac
+
+ echo "/dev/disk/by-uuid/${TARGET_UUID} / auto defaults${rootfs_mount_options} 0 1" >> /etc/fstab
+ else
+ echo "Warning: couldn't identify target UUID for rootfs, your /etc/fstab might be incomplete."
+ fi
+
+if [ -n "$EFI" ] ; then
+ UUID_EFI="$(blkid -o value -s UUID "$EFI")"
+ echo "UUID=$UUID_EFI /boot/efi vfat umask=0077 0 1" >> /etc/fstab