bailout 0
fi
-grep -q 'nolabel' /proc/cmdline && NOLABEL='TRUE' || LABEL='TRUE'
-
-
-
if [ "$CONFIG_FSTAB" = "no" ] ; then
bailout 0
fi
bailout 1
fi
+LABEL=true # by default use labels
+
+if [ -r /etc/grml/rebuildfstab.conf ] ; then
+ logit 'Reading /etc/grml/rebuildfstab.conf'
+ . /etc/grml/rebuildfstab.conf
+
+ if [ "$LABEL" = "false" ] ; then
+ logit 'Disabling LABEL=... in /etc/fstab as requested via LABEL=false'
+ fi
+fi
+
+# support overriding via boot option
+if grep -q ' nolabel' /proc/cmdline ; then
+ LABEL=false
+fi
+
+if grep -q ' label' /proc/cmdline ; then
+ LABEL=true
+fi
+
# default directories {{{
if [ -d "$MOUNTPOINT_PREFIX" ] ; then
[ -d "$MOUNTPOINT_PREFIX/floppy" ] || mkdir "$MOUNTPOINT_PREFIX/floppy"
break;
;;
*)
-if [ -n "$LABEL" ] && [ -n "$ID_FS_LABEL_ENC" ] ; then
+if "$LABEL" && [ -n "$ID_FS_LABEL_ENC" ] ; then
# see check_for_label() in scanpartitions for details
case $ID_FS_LABEL_ENC in
*\x*)