lol

installer: fixup sd-card folder move from #110827

+31 -23
+1 -1
nixos/doc/manual/configuration/profiles/clone-config.xml
··· 16 16 On images where the installation media also becomes an installation target, 17 17 copying over <literal>configuration.nix</literal> should be disabled by 18 18 setting <literal>installer.cloneConfig</literal> to <literal>false</literal>. 19 - For example, this is done in <literal>sd-image-aarch64.nix</literal>. 19 + For example, this is done in <literal>sd-image-aarch64-installer.nix</literal>. 20 20 </para> 21 21 </section>
+4
nixos/modules/installer/sd-card/sd-image-aarch64-installer.nix
··· 3 3 ../../profiles/installation-device.nix 4 4 ./sd-image-aarch64.nix 5 5 ]; 6 + 7 + # the installation media is also the installation target, 8 + # so we don't want to provide the installation configuration.nix. 9 + installer.cloneConfig = false; 6 10 }
+4
nixos/modules/installer/sd-card/sd-image-aarch64-new-kernel-installer.nix
··· 3 3 ../../profiles/installation-device.nix 4 4 ./sd-image-aarch64-new-kernel.nix 5 5 ]; 6 + 7 + # the installation media is also the installation target, 8 + # so we don't want to provide the installation configuration.nix. 9 + installer.cloneConfig = false; 6 10 }
+1 -5
nixos/modules/installer/sd-card/sd-image-aarch64.nix
··· 1 1 # To build, use: 2 - # nix-build nixos -I nixos-config=nixos/modules/installer/cd-dvd/sd-image-aarch64.nix -A config.system.build.sdImage 2 + # nix-build nixos -I nixos-config=nixos/modules/installer/sd-card/sd-image-aarch64.nix -A config.system.build.sdImage 3 3 { config, lib, pkgs, ... }: 4 4 5 5 { ··· 72 72 ${config.boot.loader.generic-extlinux-compatible.populateCmd} -c ${config.system.build.toplevel} -d ./files/boot 73 73 ''; 74 74 }; 75 - 76 - # the installation media is also the installation target, 77 - # so we don't want to provide the installation configuration.nix. 78 - installer.cloneConfig = false; 79 75 }
+4
nixos/modules/installer/sd-card/sd-image-armv7l-multiplatform-installer.nix
··· 3 3 ../../profiles/installation-device.nix 4 4 ./sd-image-armv7l-multiplatform.nix 5 5 ]; 6 + 7 + # the installation media is also the installation target, 8 + # so we don't want to provide the installation configuration.nix. 9 + installer.cloneConfig = false; 6 10 }
+1 -5
nixos/modules/installer/sd-card/sd-image-armv7l-multiplatform.nix
··· 1 1 # To build, use: 2 - # nix-build nixos -I nixos-config=nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix -A config.system.build.sdImage 2 + # nix-build nixos -I nixos-config=nixos/modules/installer/sd-card/sd-image-armv7l-multiplatform.nix -A config.system.build.sdImage 3 3 { config, lib, pkgs, ... }: 4 4 5 5 { ··· 49 49 ${config.boot.loader.generic-extlinux-compatible.populateCmd} -c ${config.system.build.toplevel} -d ./files/boot 50 50 ''; 51 51 }; 52 - 53 - # the installation media is also the installation target, 54 - # so we don't want to provide the installation configuration.nix. 55 - installer.cloneConfig = false; 56 52 }
-6
nixos/modules/installer/sd-card/sd-image-raspberryp4-installer.nix
··· 1 - { 2 - imports = [ 3 - ../../profiles/installation-device.nix 4 - ./sd-image-raspberrypi4.nix 5 - ]; 6 - }
+4
nixos/modules/installer/sd-card/sd-image-raspberrypi-installer.nix
··· 3 3 ../../profiles/installation-device.nix 4 4 ./sd-image-raspberrypi.nix 5 5 ]; 6 + 7 + # the installation media is also the installation target, 8 + # so we don't want to provide the installation configuration.nix. 9 + installer.cloneConfig = false; 6 10 }
+1 -5
nixos/modules/installer/sd-card/sd-image-raspberrypi.nix
··· 1 1 # To build, use: 2 - # nix-build nixos -I nixos-config=nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix -A config.system.build.sdImage 2 + # nix-build nixos -I nixos-config=nixos/modules/installer/sd-card/sd-image-raspberrypi.nix -A config.system.build.sdImage 3 3 { config, lib, pkgs, ... }: 4 4 5 5 { ··· 38 38 ${config.boot.loader.generic-extlinux-compatible.populateCmd} -c ${config.system.build.toplevel} -d ./files/boot 39 39 ''; 40 40 }; 41 - 42 - # the installation media is also the installation target, 43 - # so we don't want to provide the installation configuration.nix. 44 - installer.cloneConfig = false; 45 41 }
+10
nixos/modules/installer/sd-card/sd-image-raspberrypi4-installer.nix
··· 1 + { 2 + imports = [ 3 + ../../profiles/installation-device.nix 4 + ./sd-image-raspberrypi4.nix 5 + ]; 6 + 7 + # the installation media is also the installation target, 8 + # so we don't want to provide the installation configuration.nix. 9 + installer.cloneConfig = false; 10 + }
+1 -1
nixos/modules/installer/sd-card/sd-image-raspberrypi4.nix
··· 1 1 # To build, use: 2 - # nix-build nixos -I nixos-config=nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix -A config.system.build.sdImage 2 + # nix-build nixos -I nixos-config=nixos/modules/installer/sd-card/sd-image-raspberrypi4.nix -A config.system.build.sdImage 3 3 { config, lib, pkgs, ... }: 4 4 5 5 {