[meta-intel] [PATCH] quark: use UUID for rootfs

Jianxun Zhang jianxun.zhang at linux.intel.com
Mon Oct 31 17:02:02 PDT 2016


Port the change http://lists.openembedded.org/pipermail/
openembedded-core/2016-October/127948.html into wks files
in meta-intel.

Note: This patch has not been on OE master branch at this point.

Original commit message:

----------------------------------
systemd-bootdisk.wks: use PARTUUID

Root device name in systemd-bootdisk.wks is 'sda'. This can cause
images, produced using this wks to refuse booting if real device
name is not 'sda'. For example, when booting MinnowBoard MAX from
MicroSD card the boot process stucks with this message on the boot
console output: Waiting for root device /dev/sda2...
This happens because real device name of MicroSD card on this device
is mmcblk1.

Used --use-uuid option for root partition. This should make
wic to put partition UUID instead of device name into kernel command
line.

[YOCTO #10485]

Signed-off-by: Ed Bartosh <ed.bartosh at linux.intel.com>
----------------------------------

Signed-off-by: Jianxun Zhang <jianxun.zhang at linux.intel.com>
---
 scripts/lib/wic/canned-wks/galileodisk-sd.wks  | 2 +-
 scripts/lib/wic/canned-wks/galileodisk-usb.wks | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/lib/wic/canned-wks/galileodisk-sd.wks b/scripts/lib/wic/canned-wks/galileodisk-sd.wks
index e03c2f8..6d96af4 100644
--- a/scripts/lib/wic/canned-wks/galileodisk-sd.wks
+++ b/scripts/lib/wic/canned-wks/galileodisk-sd.wks
@@ -4,6 +4,6 @@
 
 part /boot --source bootimg-efi --sourceparams="loader=systemd-boot" --ondisk mmcblk0 --label msdos --active --align 1024
 
-part / --source rootfs --ondisk mmcblk0 --fstype=ext3 --label platform --align 1024
+part / --source rootfs --ondisk mmcblk0 --fstype=ext3 --label platform --align 1024 --use-uuid
 
 bootloader  --timeout=0  --append="console=ttyS1,115200n8 earlycon=uart8250,mmio32,0x9000b000,115200n8 reboot=efi,warm apic=debug rw LABEL=boot debugshell=5"
diff --git a/scripts/lib/wic/canned-wks/galileodisk-usb.wks b/scripts/lib/wic/canned-wks/galileodisk-usb.wks
index b721c95..d746cc8 100644
--- a/scripts/lib/wic/canned-wks/galileodisk-usb.wks
+++ b/scripts/lib/wic/canned-wks/galileodisk-usb.wks
@@ -4,6 +4,6 @@
 
 part /boot --source bootimg-efi --sourceparams="loader=systemd-boot" --ondisk sda --label msdos --active --align 1024
 
-part / --source rootfs --ondisk sda --fstype=ext3 --label platform --align 1024
+part / --source rootfs --ondisk sda --fstype=ext3 --label platform --align 1024 --use-uuid
 
 bootloader  --timeout=0  --append="rootwait console=ttyS1,115200n8 earlycon=uart8250,mmio32,0x9000b000,115200n8 reboot=efi,warm apic=debug rw LABEL=boot debugshell=5"
-- 
2.7.4



More information about the meta-intel mailing list