diff options
author | Florian Friesdorf <flo@chaoflow.net> | 2011-12-29 00:51:35 +0000 |
---|---|---|
committer | Florian Friesdorf <flo@chaoflow.net> | 2011-12-29 00:51:35 +0000 |
commit | eb755d46923b0f7a3ac184a6e4790114a9974af3 (patch) | |
tree | ccb53984147be13d3a0a7b77a42b111af0f0fdfd /modules/system | |
parent | 3ebc7727f7115c0777d4c17ccb13a34fa8ff0228 (diff) | |
download | nixpkgs-eb755d46923b0f7a3ac184a6e4790114a9974af3.tar nixpkgs-eb755d46923b0f7a3ac184a6e4790114a9974af3.tar.gz nixpkgs-eb755d46923b0f7a3ac184a6e4790114a9974af3.tar.bz2 nixpkgs-eb755d46923b0f7a3ac184a6e4790114a9974af3.tar.lz nixpkgs-eb755d46923b0f7a3ac184a6e4790114a9974af3.tar.xz nixpkgs-eb755d46923b0f7a3ac184a6e4790114a9974af3.tar.zst nixpkgs-eb755d46923b0f7a3ac184a6e4790114a9974af3.zip |
switched all mergeOptionString to pkgs.lib.types.string
pierron recommended the use of types.string over mergeOptionString, as it is superior but might break things. For my system the change evaluated to the exactly same. svn path=/nixos/trunk/; revision=31138
Diffstat (limited to 'modules/system')
-rw-r--r-- | modules/system/boot/stage-1.nix | 10 | ||||
-rw-r--r-- | modules/system/boot/stage-2.nix | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix index e178f2c04c9..bc27c9f80ff 100644 --- a/modules/system/boot/stage-1.nix +++ b/modules/system/boot/stage-1.nix @@ -37,7 +37,7 @@ let boot.initrd.preLVMCommands = mkOption { default = ""; - merge = mergeStringOption; + type = with types; string; description = '' Shell commands to be executed immediately before lvm discovery. ''; @@ -45,7 +45,7 @@ let boot.initrd.postDeviceCommands = mkOption { default = ""; - merge = mergeStringOption; + type = with types; string; description = '' Shell commands to be executed immediately after stage 1 of the boot has loaded kernel modules and created device nodes in @@ -55,7 +55,7 @@ let boot.initrd.postMountCommands = mkOption { default = ""; - merge = mergeStringOption; + type = with types; string; description = '' Shell commands to be executed immediately after the stage 1 filesystems have been mounted. @@ -65,7 +65,7 @@ let boot.initrd.extraUtilsCommands = mkOption { internal = true; default = ""; - merge = mergeStringOption; + type = with types; string; description = '' Shell commands to be executed in the builder of the extra-utils derivation. This can be used to provide @@ -76,7 +76,7 @@ let boot.initrd.extraUtilsCommandsTest = mkOption { internal = true; default = ""; - merge = mergeStringOption; + type = with types; string; description = '' Shell commands to be executed in the builder of the extra-utils derivation after patchelf has done its diff --git a/modules/system/boot/stage-2.nix b/modules/system/boot/stage-2.nix index 1fb8379f29a..c45dc348b66 100644 --- a/modules/system/boot/stage-2.nix +++ b/modules/system/boot/stage-2.nix @@ -8,7 +8,7 @@ let postBootCommands = pkgs.lib.mkOption { default = ""; example = "rm -f /var/log/messages"; - merge = pkgs.lib.mergeStringOption; + type = with pkgs.lib.types; string; description = '' Shell commands to be executed just before Upstart is started. ''; |