diff options
author | Ross Burton <ross.burton@intel.com> | 2019-03-04 21:13:30 (GMT) |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2019-03-07 01:47:19 (GMT) |
commit | b5a428bc6be7e1c02ca7d0714e0a5d25f31b4a5f (patch) | |
tree | d3812b48eac123d19b221d6d95d3b650d3b07028 /wic | |
parent | a0f0731eaa0112217c1bad63cb935d4c2283bd35 (diff) | |
download | meta-intel-b5a428bc6be7e1c02ca7d0714e0a5d25f31b4a5f.tar.gz |
wic: pass APPEND to bootloader
Rename the systemd and grub-efi .wks files to .wks.in, and replace all 'append'
entries apart from rootfstype (which is specific to the wks file) with
${APPEND}, so the values of APPEND from the BSP and user is respected.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'wic')
-rw-r--r-- | wic/grub-bootdisk-microcode.wks.in (renamed from wic/grub-bootdisk-microcode.wks) | 2 | ||||
-rw-r--r-- | wic/systemd-bootdisk-microcode.wks.in (renamed from wic/systemd-bootdisk-microcode.wks) | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/wic/grub-bootdisk-microcode.wks b/wic/grub-bootdisk-microcode.wks.in index 7eda376..d83b1df 100644 --- a/wic/grub-bootdisk-microcode.wks +++ b/wic/grub-bootdisk-microcode.wks.in | |||
@@ -9,4 +9,4 @@ part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 | |||
9 | 9 | ||
10 | part swap --ondisk sda --size 44 --label swap1 --fstype=swap --use-uuid | 10 | part swap --ondisk sda --size 44 --label swap1 --fstype=swap --use-uuid |
11 | 11 | ||
12 | bootloader --ptable gpt --timeout=5 --append="rootwait rootfstype=ext4 console=ttyS0,115200 console=tty0" | 12 | bootloader --ptable gpt --timeout=5 --append="rootfstype=ext4 ${APPEND}" |
diff --git a/wic/systemd-bootdisk-microcode.wks b/wic/systemd-bootdisk-microcode.wks.in index c171fd8..0352895 100644 --- a/wic/systemd-bootdisk-microcode.wks +++ b/wic/systemd-bootdisk-microcode.wks.in | |||
@@ -10,4 +10,4 @@ part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 | |||
10 | 10 | ||
11 | part swap --ondisk sda --size 44 --label swap1 --fstype=swap --use-uuid | 11 | part swap --ondisk sda --size 44 --label swap1 --fstype=swap --use-uuid |
12 | 12 | ||
13 | bootloader --ptable gpt --timeout=5 --append="rootwait rootfstype=ext4 console=ttyS0,115200 console=tty0" | 13 | bootloader --ptable gpt --timeout=5 --append="rootfstype=ext4 ${APPEND}" |