diff options
author | California Sullivan <california.l.sullivan@intel.com> | 2017-05-12 17:15:34 -0700 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2017-05-16 08:05:07 -0700 |
commit | c339fa115a441a5d0d487457ae776a4f7a2fc505 (patch) | |
tree | 6db09e9960bd7129a280792766dad2f2601359bd /scripts | |
parent | 3e540d736154c5b5371b6e7a2bdced0e2cda1382 (diff) | |
download | meta-intel-c339fa115a441a5d0d487457ae776a4f7a2fc505.tar.gz |
canned-wks/systemd-bootdisk-uuid.wks: remove file
This was initially added as a stopgap, as OE-core's systemd-bootdisk.wks
was using a static device node name rather than device UUID as the root
target. Since OE-core's systemd-bootdisk has caught up, we don't need
this. OE-core's systemd-bootdisk also includes console=ttyS0, which is
common on many platforms and we were missing.
Also change the default WKS_FILE to be OE-core's systemd-bootdisk on
appropriate MACHINEs.
Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/lib/wic/canned-wks/systemd-bootdisk-uuid.wks | 11 |
1 files changed, 0 insertions, 11 deletions
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 fecaac2d..00000000 --- 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 | |||
5 | part /boot --source bootimg-efi --sourceparams="loader=systemd-boot" --ondisk sda --label msdos --active --align 1024 | ||
6 | |||
7 | part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 --use-uuid | ||
8 | |||
9 | part swap --ondisk sda --size 44 --label swap1 --fstype=swap | ||
10 | |||
11 | bootloader --ptable gpt --timeout=5 --append="rootwait rootfstype=ext4 console=tty0" | ||