From c42dd36b541ba957511419764c36e821897e2cab Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Tue, 8 Nov 2016 08:11:06 -0800 Subject: systemd-bootdisk.wks: Rename to systemd-bootdisk-uuid.wks This change is required because it was unconditionally overriding the OE-Core systemd-boot.wks which is against the Yocto Project compatible requirements. This is also temporary for morty and will be removed from master once the OE-Core version is corrected [YOCTO #10610] Signed-off-by: Saul Wold --- scripts/lib/wic/canned-wks/systemd-bootdisk-uuid.wks | 11 +++++++++++ scripts/lib/wic/canned-wks/systemd-bootdisk.wks | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 scripts/lib/wic/canned-wks/systemd-bootdisk-uuid.wks delete mode 100644 scripts/lib/wic/canned-wks/systemd-bootdisk.wks (limited to 'scripts/lib/wic') diff --git a/scripts/lib/wic/canned-wks/systemd-bootdisk-uuid.wks b/scripts/lib/wic/canned-wks/systemd-bootdisk-uuid.wks new file mode 100644 index 00000000..fecaac2d --- /dev/null +++ b/scripts/lib/wic/canned-wks/systemd-bootdisk-uuid.wks @@ -0,0 +1,11 @@ +# short-description: Create an EFI disk image with systemd-boot +# long-description: Creates a partitioned EFI disk image that the user +# can directly dd to boot media. The selected bootloader is systemd-boot. + +part /boot --source bootimg-efi --sourceparams="loader=systemd-boot" --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="rootwait rootfstype=ext4 console=tty0" diff --git a/scripts/lib/wic/canned-wks/systemd-bootdisk.wks b/scripts/lib/wic/canned-wks/systemd-bootdisk.wks deleted file mode 100644 index fecaac2d..00000000 --- a/scripts/lib/wic/canned-wks/systemd-bootdisk.wks +++ /dev/null @@ -1,11 +0,0 @@ -# short-description: Create an EFI disk image with systemd-boot -# long-description: Creates a partitioned EFI disk image that the user -# can directly dd to boot media. The selected bootloader is systemd-boot. - -part /boot --source bootimg-efi --sourceparams="loader=systemd-boot" --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="rootwait rootfstype=ext4 console=tty0" -- cgit v1.2.3-54-g00ecf