X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Fgrml-udev-rebuildfstab;h=38fbd2609fcae83e8aa29615eebb07206bccb5d3;hb=fd5cfa9aea4e7207e380df248f6f33042e303979;hp=5b588d54289c0a1a9458fb25e2bfac91333df87b;hpb=9647e6a1f5de49bfb0264048407cf1066ee7a59d;p=grml-udev-config.git

diff --git a/scripts/grml-udev-rebuildfstab b/scripts/grml-udev-rebuildfstab
index 5b588d5..38fbd26 100755
--- a/scripts/grml-udev-rebuildfstab
+++ b/scripts/grml-udev-rebuildfstab
@@ -138,9 +138,18 @@ iso9660)
 break;
 ;;
 *)
-if [ -n "$LABEL" ]  && [ -n "$ID_FS_LABEL" ] ; then
-  case $ID_FS_LABEL in *\ *|*\x20*) break ;; esac
-  echo "LABEL=$ID_FS_LABEL"
+if [ -n "$LABEL" ]  && [ -n "$ID_FS_LABEL_ENC" ] ; then
+  # see check_for_label() in scanpartitions for details
+  case $ID_FS_LABEL_ENC in
+    *\ *|*\x20*)
+      addinfo=" # space char inside label ($ID_FS_LABEL_ENC) not supported"
+      break ;;
+    /)
+      addinfo=" # label '/' not supported"
+      break ;;
+  esac
+
+  echo "LABEL=$ID_FS_LABEL_ENC"
   return
 fi
 ;;
@@ -245,8 +254,8 @@ case $ACTION in
 add|change)
 (
     flock -x 200
-    echo $ADDEDBYGRML $DEVNAME >> /etc/fstab
-    echo $device $mountpoint $ID_FS_TYPE $options 0 0 $addinfo >> /etc/fstab
+    echo "$ADDEDBYGRML $DEVNAME" >> /etc/fstab
+    echo "$device $mountpoint $ID_FS_TYPE $options 0 0 $addinfo # $DEVNAME" >> /etc/fstab
 ) 200>/var/run/rebuildfstab.lock