From 3c744bf68d0dbfbe18f9b0d5487b843f29ed47c1 Mon Sep 17 00:00:00 2001 From: David Arnold Date: Wed, 27 Jan 2021 22:00:45 -0500 Subject: [PATCH] installer: split sd-card into installer & base for bespoke image --- .../installer/sd-card/sd-image-aarch64-installer.nix | 6 ++++++ .../sd-card/sd-image-aarch64-new-kernel-installer.nix | 6 ++++++ nixos/modules/installer/sd-card/sd-image-aarch64.nix | 1 - .../sd-card/sd-image-armv7l-multiplatform-installer.nix | 6 ++++++ .../installer/sd-card/sd-image-armv7l-multiplatform.nix | 1 - .../installer/sd-card/sd-image-raspberryp4-installer.nix | 6 ++++++ .../installer/sd-card/sd-image-raspberrypi-installer.nix | 6 ++++++ nixos/modules/installer/sd-card/sd-image-raspberrypi.nix | 1 - 8 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 nixos/modules/installer/sd-card/sd-image-aarch64-installer.nix create mode 100644 nixos/modules/installer/sd-card/sd-image-aarch64-new-kernel-installer.nix create mode 100644 nixos/modules/installer/sd-card/sd-image-armv7l-multiplatform-installer.nix create mode 100644 nixos/modules/installer/sd-card/sd-image-raspberryp4-installer.nix create mode 100644 nixos/modules/installer/sd-card/sd-image-raspberrypi-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 new file mode 100644 index 00000000000..b9e8a3ec81f --- /dev/null +++ b/nixos/modules/installer/sd-card/sd-image-aarch64-installer.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ../../profiles/installation-device.nix + ./sd-image-aarch64.nix + ]; +} 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 new file mode 100644 index 00000000000..fdb6da31f4c --- /dev/null +++ b/nixos/modules/installer/sd-card/sd-image-aarch64-new-kernel-installer.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ../../profiles/installation-device.nix + ./sd-image-aarch64-new-kernel.nix + ]; +} diff --git a/nixos/modules/installer/sd-card/sd-image-aarch64.nix b/nixos/modules/installer/sd-card/sd-image-aarch64.nix index e4ec2d6240d..ea696cbbc71 100644 --- a/nixos/modules/installer/sd-card/sd-image-aarch64.nix +++ b/nixos/modules/installer/sd-card/sd-image-aarch64.nix @@ -5,7 +5,6 @@ { imports = [ ../../profiles/base.nix - ../../profiles/installation-device.nix ./sd-image.nix ]; 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 new file mode 100644 index 00000000000..36b59b1ef93 --- /dev/null +++ b/nixos/modules/installer/sd-card/sd-image-armv7l-multiplatform-installer.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ../../profiles/installation-device.nix + ./sd-image-armv7l-multiplatform.nix + ]; +} 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 d2ba611532e..08f2fbaaaf2 100644 --- a/nixos/modules/installer/sd-card/sd-image-armv7l-multiplatform.nix +++ b/nixos/modules/installer/sd-card/sd-image-armv7l-multiplatform.nix @@ -5,7 +5,6 @@ { imports = [ ../../profiles/base.nix - ../../profiles/installation-device.nix ./sd-image.nix ]; diff --git a/nixos/modules/installer/sd-card/sd-image-raspberryp4-installer.nix b/nixos/modules/installer/sd-card/sd-image-raspberryp4-installer.nix new file mode 100644 index 00000000000..8f2715569be --- /dev/null +++ b/nixos/modules/installer/sd-card/sd-image-raspberryp4-installer.nix @@ -0,0 +1,6 @@ +{ + 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 new file mode 100644 index 00000000000..6bfbeb3cfcd --- /dev/null +++ b/nixos/modules/installer/sd-card/sd-image-raspberrypi-installer.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ../../profiles/installation-device.nix + ./sd-image-raspberrypi.nix + ]; +} diff --git a/nixos/modules/installer/sd-card/sd-image-raspberrypi.nix b/nixos/modules/installer/sd-card/sd-image-raspberrypi.nix index 40a01f96177..d16d2d0fa28 100644 --- a/nixos/modules/installer/sd-card/sd-image-raspberrypi.nix +++ b/nixos/modules/installer/sd-card/sd-image-raspberrypi.nix @@ -5,7 +5,6 @@ { imports = [ ../../profiles/base.nix - ../../profiles/installation-device.nix ./sd-image.nix ];