summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--conf/machine/intel-core2-32.conf2
-rw-r--r--conf/machine/intel-corei7-64.conf2
-rw-r--r--scripts/lib/wic/canned-wks/systemd-bootdisk-uuid.wks11
3 files changed, 2 insertions, 13 deletions
diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf
index c15f72b..a08ce89 100644
--- a/conf/machine/intel-core2-32.conf
+++ b/conf/machine/intel-core2-32.conf
@@ -33,5 +33,5 @@ APPEND += "rootwait console=ttyS0,115200 console=ttyPCH0,115200 console=tty0"
33PACKAGE_INSTALL_append_pn-core-image-minimal-initramfs = " linux-firmware-i915" 33PACKAGE_INSTALL_append_pn-core-image-minimal-initramfs = " linux-firmware-i915"
34 34
35IMAGE_FSTYPES += "wic" 35IMAGE_FSTYPES += "wic"
36WKS_FILE ?= "systemd-bootdisk-uuid.wks" 36WKS_FILE ?= "systemd-bootdisk.wks"
37do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" 37do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf
index 1e5de49..cca45c7 100644
--- a/conf/machine/intel-corei7-64.conf
+++ b/conf/machine/intel-corei7-64.conf
@@ -34,5 +34,5 @@ APPEND += "rootwait console=ttyS0,115200 console=tty0"
34PACKAGE_INSTALL_append_pn-core-image-minimal-initramfs = " linux-firmware-i915" 34PACKAGE_INSTALL_append_pn-core-image-minimal-initramfs = " linux-firmware-i915"
35 35
36IMAGE_FSTYPES += "wic" 36IMAGE_FSTYPES += "wic"
37WKS_FILE ?= "systemd-bootdisk-uuid.wks" 37WKS_FILE ?= "systemd-bootdisk.wks"
38do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" 38do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
diff --git a/scripts/lib/wic/canned-wks/systemd-bootdisk-uuid.wks b/scripts/lib/wic/canned-wks/systemd-bootdisk-uuid.wks
deleted file mode 100644
index fecaac2..0000000
--- a/scripts/lib/wic/canned-wks/systemd-bootdisk-uuid.wks
+++ /dev/null
@@ -1,11 +0,0 @@
1# short-description: Create an EFI disk image with systemd-boot
2# long-description: Creates a partitioned EFI disk image that the user
3# can directly dd to boot media. The selected bootloader is systemd-boot.
4
5part /boot --source bootimg-efi --sourceparams="loader=systemd-boot" --ondisk sda --label msdos --active --align 1024
6
7part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 --use-uuid
8
9part swap --ondisk sda --size 44 --label swap1 --fstype=swap
10
11bootloader --ptable gpt --timeout=5 --append="rootwait rootfstype=ext4 console=tty0"