diff mbox series

canned-wks/mkefidisk.wks: generalise wic image

Message ID 20231115170019.486387-1-ross.burton@arm.com
State New
Headers show
Series canned-wks/mkefidisk.wks: generalise wic image | expand

Commit Message

Ross Burton Nov. 15, 2023, 5 p.m. UTC 
From: Ross Burton <ross.burton@arm.com>

Update this wic image to be more generalised:

- Use ${EFI_PROVIDER} instead of hard-coding grub-efi
- Don't set the console explicitly, the kernel can set that up
- Use generic partition names "boot" and "root" instead of "msdos" and
  "platform"
- Use UUIDs for more mounts

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 scripts/lib/wic/canned-wks/mkefidisk.wks    | 11 -----------
 scripts/lib/wic/canned-wks/mkefidisk.wks.in | 11 +++++++++++
 2 files changed, 11 insertions(+), 11 deletions(-)
 delete mode 100644 scripts/lib/wic/canned-wks/mkefidisk.wks
 create mode 100644 scripts/lib/wic/canned-wks/mkefidisk.wks.in
diff mbox series

Patch

diff --git a/scripts/lib/wic/canned-wks/mkefidisk.wks b/scripts/lib/wic/canned-wks/mkefidisk.wks
deleted file mode 100644
index 9f534fe1847..00000000000
--- a/scripts/lib/wic/canned-wks/mkefidisk.wks
+++ /dev/null
@@ -1,11 +0,0 @@ 
-# short-description: Create an EFI disk image
-# long-description: Creates a partitioned EFI disk image that the user
-# can directly dd to boot media.
-
-part /boot --source bootimg-efi --sourceparams="loader=grub-efi" --ondisk sda --label msdos --active --align 1024
-
-part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 --use-uuid
-
-part swap --ondisk sda --size 44 --label swap1 --fstype=swap
-
-bootloader --ptable gpt --timeout=5 --append="rootfstype=ext4 console=ttyS0,115200 console=tty0"
diff --git a/scripts/lib/wic/canned-wks/mkefidisk.wks.in b/scripts/lib/wic/canned-wks/mkefidisk.wks.in
new file mode 100644
index 00000000000..1f06830a5fc
--- /dev/null
+++ b/scripts/lib/wic/canned-wks/mkefidisk.wks.in
@@ -0,0 +1,11 @@ 
+# short-description: Create an EFI disk image
+# long-description: Creates a partitioned EFI disk image that the user
+# can directly dd to boot media.
+
+part /boot --source bootimg-efi --sourceparams="loader=${EFI_PROVIDER}" --label boot --active --align 1024 --use-uuid
+
+part / --source rootfs --fstype=ext4 --label root --align 1024 --use-uuid
+
+part swap --size 44 --label swap --fstype=swap --use-uuid
+
+bootloader --ptable gpt --timeout=5 --append="rootwait rootfstype=ext4"