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

Allow specifying [] as filesystem option

Browse Source 
because you don't need any on vservers
You still get a warning when not setting the value so that you can't
forget it.

svn path=/nixos/branches/fix-style/; revision=14477
This commit is contained in:
Marc Weber 2009-03-09 19:18:27 +00:00
parent 0a010e671a
commit aeba0af8dd
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot/boot-stage-1.nix
View File

@ -148,7 +148,7 @@ rec {
# !!! copy&pasted from upstart-jobs/filesystems.nix. # !!! copy&pasted from upstart-jobs/filesystems.nix.
mountPoints = mountPoints =
if fileSystems == [] if fileSystems == null
then abort "You must specify the fileSystems option!" then abort "You must specify the fileSystems option!"
else map (fs: fs.mountPoint) fileSystems; else map (fs: fs.mountPoint) fileSystems;
devices = map (fs: if fs ? device then fs.device else "/dev/disk/by-label/${fs.label}") fileSystems; devices = map (fs: if fs ? device then fs.device else "/dev/disk/by-label/${fs.label}") fileSystems;

2
system/options.nix
View File

@ -303,7 +303,7 @@ in
fileSystems = mkOption { fileSystems = mkOption {
default = []; default = null;
example = [ example = [
{ mountPoint = "/"; { mountPoint = "/";
device = "/dev/hda1"; device = "/dev/hda1";