From 6d07b2a545919ed19b8581524684f919c6de666d Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 3 Mar 2008 23:30:49 +0000 Subject: [PATCH] Added seccureUser to default environment (it is the encryption tool I hope to use for configuration files), made checkConfigurationOptions on by default, added nixos-gen-seccure-keys to nixosTools svn path=/nixos/trunk/; revision=10935 --- system/options.nix | 4 ++-- system/system.nix | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/system/options.nix b/system/options.nix index 9244d54d3b2..131daa14876 100644 --- a/system/options.nix +++ b/system/options.nix @@ -2129,8 +2129,8 @@ root ALL=(ALL) SETENV: ALL }; checkConfigurationOptions = mkOption { - default = false; - example = true; + default = true; + example = false; description = " If all configuration options must be checked. Non-existing options fail build. "; diff --git a/system/system.nix b/system/system.nix index 2a37622b6c0..b1a2a91d3f1 100644 --- a/system/system.nix +++ b/system/system.nix @@ -208,6 +208,7 @@ rec { nixosTools.nixosRebuild nixosTools.nixosCheckout nixosTools.nixosHardwareScan + nixosTools.nixosGenSeccureKeys setuidWrapper ] ++ pkgs.lib.optionals (!config.environment.cleanStart) [ @@ -242,6 +243,7 @@ rec { pkgs.pwdutils pkgs.reiserfsprogs pkgs.rsync + pkgs.seccureUser pkgs.strace pkgs.su pkgs.sysklogd