diff options
author | David Arnold <dar@xoe.solutions> | 2021-02-21 15:16:51 -0500 |
---|---|---|
committer | David Arnold <dar@xoe.solutions> | 2021-02-21 16:12:54 -0500 |
commit | 6bfaed9b2c691a93933ce3bc4a9f3c41c45becf2 (patch) | |
tree | 879c07181416564da51aee2d9f8dc59c508f0910 /nixos | |
parent | 95b7f99014ca7abc8939c438c3a944303aca3201 (diff) |
installer: fixup sd-card folder move from #110827
Diffstat (limited to 'nixos')
11 files changed, 31 insertions, 23 deletions
diff --git a/nixos/doc/manual/configuration/profiles/clone-config.xml b/nixos/doc/manual/configuration/profiles/clone-config.xml index 04fa1643d0fd0..9c70cf352041a 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>. - For example, this is done in <literal>sd-image-aarch64.nix</literal>. + For example, this is done in <literal>sd-image-aarch64-installer.nix</literal>. </para> </section> diff --git a/nixos/modules/installer/sd-card/sd-image-aarch64-installer.nix b/nixos/modules/installer/sd-card/sd-image-aarch64-installer.nix index b9e8a3ec81f04..2a6b6abdf913e 100644 --- a/nixos/modules/installer/sd-card/sd-image-aarch64-installer.nix +++ b/nixos/modules/installer/sd-card/sd-image-aarch64-installer.nix @@ -3,4 +3,8 @@ ../../profiles/installation-device.nix ./sd-image-aarch64.nix ]; + + # 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/sd-card/sd-image-aarch64-new-kernel-installer.nix b/nixos/modules/installer/sd-card/sd-image-aarch64-new-kernel-installer.nix index fdb6da31f4c6b..1b6b55ff29183 100644 --- a/nixos/modules/installer/sd-card/sd-image-aarch64-new-kernel-installer.nix +++ b/nixos/modules/installer/sd-card/sd-image-aarch64-new-kernel-installer.nix @@ -3,4 +3,8 @@ ../../profiles/installation-device.nix ./sd-image-aarch64-new-kernel.nix ]; + + # 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/sd-card/sd-image-aarch64.nix b/nixos/modules/installer/sd-card/sd-image-aarch64.nix index ea696cbbc71ec..96ebb7537da32 100644 --- a/nixos/modules/installer/sd-card/sd-image-aarch64.nix +++ b/nixos/modules/installer/sd-card/sd-image-aarch64.nix @@ -1,5 +1,5 @@ # To build, use: -# nix-build nixos -I nixos-config=nixos/modules/installer/cd-dvd/sd-image-aarch64.nix -A config.system.build.sdImage +# nix-build nixos -I nixos-config=nixos/modules/installer/sd-card/sd-image-aarch64.nix -A config.system.build.sdImage { config, lib, pkgs, ... }: { @@ -72,8 +72,4 @@ ${config.boot.loader.generic-extlinux-compatible.populateCmd} -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/sd-card/sd-image-armv7l-multiplatform-installer.nix b/nixos/modules/installer/sd-card/sd-image-armv7l-multiplatform-installer.nix index 36b59b1ef9382..fbe04377d50d6 100644 --- a/nixos/modules/installer/sd-card/sd-image-armv7l-multiplatform-installer.nix +++ b/nixos/modules/installer/sd-card/sd-image-armv7l-multiplatform-installer.nix @@ -3,4 +3,8 @@ ../../profiles/installation-device.nix ./sd-image-armv7l-multiplatform.nix ]; + + # 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/sd-card/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/sd-card/sd-image-armv7l-multiplatform.nix index 08f2fbaaaf22b..23ed928512966 100644 --- a/nixos/modules/installer/sd-card/sd-image-armv7l-multiplatform.nix +++ b/nixos/modules/installer/sd-card/sd-image-armv7l-multiplatform.nix @@ -1,5 +1,5 @@ # To build, use: -# nix-build nixos -I nixos-config=nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix -A config.system.build.sdImage +# nix-build nixos -I nixos-config=nixos/modules/installer/sd-card/sd-image-armv7l-multiplatform.nix -A config.system.build.sdImage { config, lib, pkgs, ... }: { @@ -49,8 +49,4 @@ ${config.boot.loader.generic-extlinux-compatible.populateCmd} -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/sd-card/sd-image-raspberryp4-installer.nix b/nixos/modules/installer/sd-card/sd-image-raspberryp4-installer.nix deleted file mode 100644 index 8f2715569bee5..0000000000000 --- a/nixos/modules/installer/sd-card/sd-image-raspberryp4-installer.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - imports = [ - ../../profiles/installation-device.nix - ./sd-image-raspberrypi4.nix - ]; -} diff --git a/nixos/modules/installer/sd-card/sd-image-raspberrypi-installer.nix b/nixos/modules/installer/sd-card/sd-image-raspberrypi-installer.nix index 6bfbeb3cfcdbf..72ec7485b528d 100644 --- a/nixos/modules/installer/sd-card/sd-image-raspberrypi-installer.nix +++ b/nixos/modules/installer/sd-card/sd-image-raspberrypi-installer.nix @@ -3,4 +3,8 @@ ../../profiles/installation-device.nix ./sd-image-raspberrypi.nix ]; + + # 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/sd-card/sd-image-raspberrypi.nix b/nixos/modules/installer/sd-card/sd-image-raspberrypi.nix index d16d2d0fa28db..83850f4c11587 100644 --- a/nixos/modules/installer/sd-card/sd-image-raspberrypi.nix +++ b/nixos/modules/installer/sd-card/sd-image-raspberrypi.nix @@ -1,5 +1,5 @@ # To build, use: -# nix-build nixos -I nixos-config=nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix -A config.system.build.sdImage +# nix-build nixos -I nixos-config=nixos/modules/installer/sd-card/sd-image-raspberrypi.nix -A config.system.build.sdImage { config, lib, pkgs, ... }: { @@ -38,8 +38,4 @@ ${config.boot.loader.generic-extlinux-compatible.populateCmd} -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/sd-card/sd-image-raspberrypi4-installer.nix b/nixos/modules/installer/sd-card/sd-image-raspberrypi4-installer.nix new file mode 100644 index 0000000000000..59423e40b64c9 --- /dev/null +++ b/nixos/modules/installer/sd-card/sd-image-raspberrypi4-installer.nix @@ -0,0 +1,10 @@ +{ + imports = [ + ../../profiles/installation-device.nix + ./sd-image-raspberrypi4.nix + ]; + + # 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/sd-card/sd-image-raspberrypi4.nix b/nixos/modules/installer/sd-card/sd-image-raspberrypi4.nix index 5bdec7de86e8a..35a12c5382f7e 100644 --- a/nixos/modules/installer/sd-card/sd-image-raspberrypi4.nix +++ b/nixos/modules/installer/sd-card/sd-image-raspberrypi4.nix @@ -1,5 +1,5 @@ # To build, use: -# nix-build nixos -I nixos-config=nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix -A config.system.build.sdImage +# nix-build nixos -I nixos-config=nixos/modules/installer/sd-card/sd-image-raspberrypi4.nix -A config.system.build.sdImage { config, lib, pkgs, ... }: { |