diff --git a/nixos/doc/manual/configuration/profiles/clone-config.xml b/nixos/doc/manual/configuration/profiles/clone-config.xml
index 04fa1643d0f..9c70cf35204 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 configuration.nix should be disabled by
setting installer.cloneConfig to false.
- For example, this is done in sd-image-aarch64.nix.
+ For example, this is done in sd-image-aarch64-installer.nix.
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 b9e8a3ec81f..2a6b6abdf91 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 fdb6da31f4c..1b6b55ff291 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 ea696cbbc71..96ebb7537da 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 36b59b1ef93..fbe04377d50 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 08f2fbaaaf2..23ed9285129 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 8f2715569be..00000000000
--- 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 6bfbeb3cfcd..72ec7485b52 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 d16d2d0fa28..83850f4c115 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 00000000000..59423e40b64
--- /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 5bdec7de86e..35a12c5382f 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, ... }:
{