* Hacked up support for volume labels.

svn path=/nixos/trunk/; revision=7587

upstart-jobs/filesystems.nix

@@ -41,16 +41,23 @@ script
             fsType=\${fsTypes[$n]}
             options=\${optionss[$n]}
 
-            if ! test -e \"$device\"; then
+            isLabel=
+            if echo \"$device\" | grep -q '^LABEL='; then isLabel=1; fi
+
+            if ! test -n \"$isLabel\" -o -e \"$device\"; then
                 echo \"skipping $device, doesn't exist (yet)\"
                 continue
             fi
 
-            device=$(readlink -f \"$device\")
-
             # If $device is already mounted somewhere else, unmount it first.
             # !!! Note: we use /etc/mtab, not /proc/mounts, because mtab
             # contains more accurate info when using loop devices.
+
+            # !!! not very smart about labels yet; should resolve the label somehow.
+            if test -z \"$isLabel\"; then
+
+                device=$(readlink -f \"$device\")
+
                 prevMountPoint=$(
                     cat /etc/mtab \\
                     | grep \"^$device \" \\
@@ -70,6 +77,8 @@ script
                     ${utillinux}/bin/umount \"$prevMountPoint\" || true
                 fi
 
+            fi
+
             echo \"mounting $device on $mountPoint\"
 
             # !!! should do something with the result; also prevent repeated fscks.