public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* In fileSystems: say label = "FOO"' instead of device = "LABEL=foo"'.

Browse Source 
svn path=/nixos/trunk/; revision=7611
This commit is contained in:
Eelco Dolstra 2007-01-10 13:58:48 +00:00
parent 24e34612e3
commit 7ba1682c05
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
system/options.nix
View File

@ -193,6 +193,9 @@
fsType = "ext3"; fsType = "ext3";
options = "data=journal"; options = "data=journal";
} }
{ mountPoint = "/bigdisk";
label = "bigdisk";
}
]; ];
description = " description = "
The file systems to be mounted. It must include an entry for The file systems to be mounted. It must include an entry for
@ -205,6 +208,11 @@
<literal>\"auto\"</literal>), and <literal>options</literal> <literal>\"auto\"</literal>), and <literal>options</literal>
(the mount options passed to <command>mount</command> using the (the mount options passed to <command>mount</command> using the
<option>-o</option> flag; defaults to <literal>\"defaults\"</literal>). <option>-o</option> flag; defaults to <literal>\"defaults\"</literal>).
Instead of specifying <literal>device</literal>, you can also
specify a volume label (<literal>volume</literal>) for file
systems that support it, such as ext2/ext3 (see <command>mke2fs
-L</command>).
"; ";
} }

2
upstart-jobs/filesystems.nix
View File

@ -4,7 +4,7 @@ let
# !!! use XML # !!! use XML
mountPoints = map (fs: fs.mountPoint) fileSystems; mountPoints = map (fs: fs.mountPoint) fileSystems;
devices = map (fs: fs.device) fileSystems; devices = map (fs: if fs ? device then fs.device else "LABEL=" + fs.label) fileSystems;
fsTypes = map (fs: if fs ? fsType then fs.fsType else "auto") fileSystems; fsTypes = map (fs: if fs ? fsType then fs.fsType else "auto") fileSystems;
optionss = map (fs: if fs ? options then fs.options else "defaults") fileSystems; optionss = map (fs: if fs ? options then fs.options else "defaults") fileSystems;