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

* Allow the root device to be specified by label.

Browse Source 
svn path=/nixos/trunk/; revision=7612
This commit is contained in:
Eelco Dolstra 2007-01-10 14:07:10 +00:00
parent 7ba1682c05
commit 774a0a397c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
system/system.nix
View File

@ -71,9 +71,11 @@ rec {
inherit extraUtils; inherit extraUtils;
autoDetectRootDevice = config.get ["boot" "autoDetectRootDevice"]; autoDetectRootDevice = config.get ["boot" "autoDetectRootDevice"];
rootDevice = rootDevice =
(pkgs.library.findSingle (fs: fs.mountPoint == "/") let rootFS =
(abort "No root mount point declared.") (pkgs.library.findSingle (fs: fs.mountPoint == "/")
(config.get ["fileSystems"])).device; (abort "No root mount point declared.")
(config.get ["fileSystems"]));
in if rootFS ? device then rootFS.device else "LABEL=" + rootFS.label;
rootLabel = config.get ["boot" "rootLabel"]; rootLabel = config.get ["boot" "rootLabel"];
inherit stage2Init; inherit stage2Init;
modulesDir = modulesClosure; modulesDir = modulesClosure;