diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-30 13:15:29 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-30 13:18:33 +0200 |
| commit | f94f659a31d694c395cdb65e2f1925a6092d55a3 (patch) | |
| tree | b21ac22c8ef3d833bb470b4d785ae018e4bd31ff /nixos | |
| parent | 94ce6ec866a51ff8e520a1acc592f4de04b5759c (diff) | |
| download | nixlib-f94f659a31d694c395cdb65e2f1925a6092d55a3.tar nixlib-f94f659a31d694c395cdb65e2f1925a6092d55a3.tar.gz nixlib-f94f659a31d694c395cdb65e2f1925a6092d55a3.tar.bz2 nixlib-f94f659a31d694c395cdb65e2f1925a6092d55a3.tar.lz nixlib-f94f659a31d694c395cdb65e2f1925a6092d55a3.tar.xz nixlib-f94f659a31d694c395cdb65e2f1925a6092d55a3.tar.zst nixlib-f94f659a31d694c395cdb65e2f1925a6092d55a3.zip | |
Don't require a device for tmpfs filesystems
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/installer/cd-dvd/iso-image.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/tasks/filesystems.nix | 3 | ||||
| -rw-r--r-- | nixos/tests/misc.nix | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 28c42d64f6fb..6250fac0f0bb 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -179,7 +179,6 @@ in fileSystems."/" = { fsType = "tmpfs"; - device = "none"; options = "mode=0755"; }; @@ -201,7 +200,6 @@ in fileSystems."/nix/.rw-store" = { fsType = "tmpfs"; - device = "none"; options = "mode=0755"; neededForBoot = true; }; diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index d00f479754ff..ccb6b6160151 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -9,7 +9,7 @@ let prioOption = prio: optionalString (prio !=null) " pri=${toString prio}"; - fileSystemOpts = { name, ... }: { + fileSystemOpts = { name, config, ... }: { options = { @@ -68,6 +68,7 @@ let config = { mountPoint = mkDefault name; + device = mkIf (config.fsType == "tmpfs") config.fsType; }; }; diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix index c03db6c43353..e1830d95b41f 100644 --- a/nixos/tests/misc.nix +++ b/nixos/tests/misc.nix @@ -12,8 +12,7 @@ import ./make-test.nix { services.nixosManual.enable = mkOverride 0 true; systemd.tmpfiles.rules = [ "d /tmp 1777 root root 10d" ]; fileSystems = mkVMOverride { "/tmp2" = - { device = "none"; - fsType = "tmpfs"; + { fsType = "tmpfs"; options = "mode=1777,noauto"; }; }; |