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

* Booting was broken when using the "label" option. 

svn path=/nixos/branches/modular-nixos/; revision=15957
This commit is contained in:
Eelco Dolstra 2009-06-14 11:08:44 +00:00
parent f258edcb80
commit ff58b5dede
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/system/boot/stage-1.nix
View File

@ -57,7 +57,7 @@ let
fileSystems = mkOption {
options.neededForBoot = mkOption {
default = false;
type = types.enable;
type = types.bool;
description = "
Mount this file system to boot on NixOS.
";
@ -220,9 +220,9 @@ let
if fileSystems == null
then abort "You must specify the fileSystems option!"
else map (fs: fs.mountPoint) fileSystems;
devices = map (fs: if fs ? device then fs.device else "/dev/disk/by-label/${fs.label}") 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;
devices = map (fs: if fs.device != null then fs.device else "/dev/disk/by-label/${fs.label}") fileSystems;
fsTypes = map (fs: fs.fsType) fileSystems;
optionss = map (fs: fs.options) fileSystems;
path = [
# `extraUtils' comes first because it overrides the `mount'