diff options
| author | Ben Wolsieffer <benwolsieffer@gmail.com> | 2019-09-01 12:57:21 -0400 |
|---|---|---|
| committer | Ben Wolsieffer <benwolsieffer@gmail.com> | 2019-09-01 14:15:33 -0400 |
| commit | 9e5aa25c538e411ee857847275b63ee4137ac3c6 (patch) | |
| tree | 546db557b0fdaee9d40a88960a92d5101031f5a1 | |
| parent | 6bf3d68b8d11c726c3b2105c6edd4125c0a7a859 (diff) | |
| download | nixpkgs-9e5aa25c538e411ee857847275b63ee4137ac3c6.tar nixpkgs-9e5aa25c538e411ee857847275b63ee4137ac3c6.tar.gz nixpkgs-9e5aa25c538e411ee857847275b63ee4137ac3c6.tar.bz2 nixpkgs-9e5aa25c538e411ee857847275b63ee4137ac3c6.tar.lz nixpkgs-9e5aa25c538e411ee857847275b63ee4137ac3c6.tar.xz nixpkgs-9e5aa25c538e411ee857847275b63ee4137ac3c6.tar.zst nixpkgs-9e5aa25c538e411ee857847275b63ee4137ac3c6.zip | |
sd-image: don't use installer.cloneConfig option that is not imported
This once again allows sd-image.nix to imported standalone to build SD images of arbitrary NixOS systems.
5 files changed, 13 insertions, 5 deletions
diff --git a/nixos/doc/manual/configuration/profiles/clone-config.xml b/nixos/doc/manual/configuration/profiles/clone-config.xml index 21c4ea75d6d..04fa1643d0f 100644 --- a/nixos/doc/manual/configuration/profiles/clone-config.xml +++ b/nixos/doc/manual/configuration/profiles/clone-config.xml @@ -16,6 +16,6 @@ On images where the installation media also becomes an installation target, copying over <literal>configuration.nix</literal> should be disabled by setting <literal>installer.cloneConfig</literal> to <literal>false</literal>. - This is already done in <literal>sd-image.nix</literal>. + For example, this is done in <literal>sd-image-aarch64.nix</literal>. </para> </section> diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix index a9241870fa7..2d34406a032 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix @@ -59,4 +59,8 @@ in ${extlinux-conf-builder} -t 3 -c ${config.system.build.toplevel} -d ./files/boot ''; }; + + # the installation media is also the installation target, + # so we don't want to provide the installation configuration.nix. + installer.cloneConfig = false; } diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix index dab09241531..651d1a36dc1 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix @@ -56,4 +56,8 @@ in ${extlinux-conf-builder} -t 3 -c ${config.system.build.toplevel} -d ./files/boot ''; }; + + # the installation media is also the installation target, + # so we don't want to provide the installation configuration.nix. + installer.cloneConfig = false; } diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix index 8c9090471dc..2a131d9ce98 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix @@ -45,4 +45,8 @@ in ${extlinux-conf-builder} -t 3 -c ${config.system.build.toplevel} -d ./files/boot ''; }; + + # the installation media is also the installation target, + # so we don't want to provide the installation configuration.nix. + installer.cloneConfig = false; } diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix index 34b95478944..0a015044155 100644 --- a/nixos/modules/installer/cd-dvd/sd-image.nix +++ b/nixos/modules/installer/cd-dvd/sd-image.nix @@ -194,9 +194,5 @@ in rm -f /nix-path-registration fi ''; - - # the installation media is also the installation target, - # so we don't want to provide the installation configuration.nix. - installer.cloneConfig = false; }; } |