diff options
| author | Emery Hemingway <emery@vfemail.net> | 2014-07-25 14:05:57 -0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-30 16:19:26 +0200 |
| commit | 63d259df32ab969c46aa839a77e8d86cb8f734cf (patch) | |
| tree | 37823fa540fdc124d84806bcf2f57f8d236efdef /nixos/modules/system/boot/stage-2.nix | |
| parent | 1cc6dc198466eb451beb2daa6314a345f1853dab (diff) | |
| download | nixpkgs-63d259df32ab969c46aa839a77e8d86cb8f734cf.tar nixpkgs-63d259df32ab969c46aa839a77e8d86cb8f734cf.tar.gz nixpkgs-63d259df32ab969c46aa839a77e8d86cb8f734cf.tar.bz2 nixpkgs-63d259df32ab969c46aa839a77e8d86cb8f734cf.tar.lz nixpkgs-63d259df32ab969c46aa839a77e8d86cb8f734cf.tar.xz nixpkgs-63d259df32ab969c46aa839a77e8d86cb8f734cf.tar.zst nixpkgs-63d259df32ab969c46aa839a77e8d86cb8f734cf.zip | |
nixos: tmp on tmpfs option
/tmp cleaning is done by systemd rather than stage-2-init enableEmergencyMode moved from systemd to seperate module new option to mount tmp on tmpfs new option to enable additional units shipped with systemd
Diffstat (limited to 'nixos/modules/system/boot/stage-2.nix')
| -rw-r--r-- | nixos/modules/system/boot/stage-2.nix | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/nixos/modules/system/boot/stage-2.nix b/nixos/modules/system/boot/stage-2.nix index f53c3b8b8e7..6155bb37cc5 100644 --- a/nixos/modules/system/boot/stage-2.nix +++ b/nixos/modules/system/boot/stage-2.nix @@ -17,7 +17,7 @@ let src = ./stage-2-init.sh; shellDebug = "${pkgs.bashInteractive}/bin/bash"; isExecutable = true; - inherit (config.boot) devShmSize runSize cleanTmpDir; + inherit (config.boot) devShmSize runSize; inherit (config.nix) readOnlyStore; inherit (config.networking) useHostResolvConf; ttyGid = config.ids.gids.tty; @@ -26,8 +26,7 @@ let pkgs.utillinux pkgs.sysvtools pkgs.openresolv - ] ++ (optional config.boot.cleanTmpDir pkgs.findutils) - ++ optional config.nix.readOnlyStore readonlyMountpoint; + ] ++ optional config.nix.readOnlyStore readonlyMountpoint; postBootCommands = pkgs.writeText "local-cmds" '' ${config.boot.postBootCommands} @@ -81,15 +80,6 @@ in ''; }; - # FIXME: should replace this with something that uses systemd-tmpfiles. - cleanTmpDir = mkOption { - type = types.bool; - default = false; - description = '' - Whether to delete all files in <filename>/tmp</filename> during boot. - ''; - }; - }; }; |