projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ignore "unknown" filesystems in is_supported_fs()
[live-boot-grml.git]
/
components
/
9990-misc-helpers.sh
diff --git
a/components/9990-misc-helpers.sh
b/components/9990-misc-helpers.sh
index
4815553
..
a97615b
100755
(executable)
--- a/
components/9990-misc-helpers.sh
+++ b/
components/9990-misc-helpers.sh
@@
-420,6
+420,12
@@
is_supported_fs ()
return 1
fi
return 1
fi
+ # get_fstype might report "unknown" or "swap", ignore it as no such kernel module exists
+ if [ "${fstype}" = "unknown" ] || [ "${fstype}" = "swap" ]
+ then
+ return 1
+ fi
+
# Try to look if it is already supported by the kernel
if grep -q ${fstype} /proc/filesystems
then
# Try to look if it is already supported by the kernel
if grep -q ${fstype} /proc/filesystems
then
@@
-1301,7
+1307,6
@@
do_union ()
unionmountopts="${unionmountopts}:${rofs}=${ro_opt}"
done
fi
unionmountopts="${unionmountopts}:${rofs}=${ro_opt}"
done
fi
- mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}"
;;
overlay)
;;
overlay)
@@
-1321,9
+1326,10
@@
do_union ()
mkdir "${unionrw}/rw"
mkdir "${unionrw}/work"
unionmountopts="-o noatime,lowerdir=${unionro},upperdir=${unionrw}/rw,workdir=${unionrw}/work"
mkdir "${unionrw}/rw"
mkdir "${unionrw}/work"
unionmountopts="-o noatime,lowerdir=${unionro},upperdir=${unionrw}/rw,workdir=${unionrw}/work"
- mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}"
;;
esac
;;
esac
+
+ mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}"
}
get_custom_mounts ()
}
get_custom_mounts ()