Allow specifying [] as filesystem option
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:
parent
0a010e671a
commit
aeba0af8dd
|
@ -148,7 +148,7 @@ rec {
|
|||
|
||||
# !!! copy&pasted from upstart-jobs/filesystems.nix.
|
||||
mountPoints =
|
||||
if fileSystems == []
|
||||
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;
|
||||
|
|
|
@ -303,7 +303,7 @@ in
|
|||
|
||||
|
||||
fileSystems = mkOption {
|
||||
default = [];
|
||||
default = null;
|
||||
example = [
|
||||
{ mountPoint = "/";
|
||||
device = "/dev/hda1";
|
||||
|
|
Loading…
Reference in New Issue