summaryrefslogtreecommitdiffstats
path: root/scripts/lib/wic/canned-wks
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-07-28 20:14:33 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-30 08:46:20 +0100
commit03d5daf1aeebc16800c589af6d62d5b72741696c (patch)
treec78781d28079d6de02dc11d89cfbe6a46df84b9f /scripts/lib/wic/canned-wks
parent9d07c736e39a9aa922630b4241eda185a19a11ea (diff)
downloadpoky-03d5daf1aeebc16800c589af6d62d5b72741696c.tar.gz
wic: Switch to using --use-uuid by default
The most portable way to specifiy a root device in a disk image that we create is to use PARTUUID rather than /dev/sda2. As background, both GPT and MBR tables provide valid UUID values for each partition and the Linux Kernel contains the logic to parse this value. With this change we can now boot the default disk images when used as any valid block device that the included kernel uses. This for example means that VirtualBox can be used to run vmdk without changes as it uses IDE for the virtual disk controller. Cc: Matt Porter <mporter@konsulko.com> (From OE-Core rev: 8a58e9bb3e76a9962f1d14a8bdd3f7de675c3492) Signed-off-by: Tom Rini <trini@konsulko.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/wic/canned-wks')
-rw-r--r--scripts/lib/wic/canned-wks/common.wks.inc2
-rw-r--r--scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg8
-rw-r--r--scripts/lib/wic/canned-wks/qemux86-directdisk.wks2
3 files changed, 6 insertions, 6 deletions
diff --git a/scripts/lib/wic/canned-wks/common.wks.inc b/scripts/lib/wic/canned-wks/common.wks.inc
index 5cf2fd1f3e..89880b417b 100644
--- a/scripts/lib/wic/canned-wks/common.wks.inc
+++ b/scripts/lib/wic/canned-wks/common.wks.inc
@@ -1,3 +1,3 @@
1# This file is included into 3 canned wks files from this directory 1# This file is included into 3 canned wks files from this directory
2part /boot --source bootimg-pcbios --ondisk sda --label boot --active --align 1024 2part /boot --source bootimg-pcbios --ondisk sda --label boot --active --align 1024
3part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 3part / --source rootfs --use-uuid --fstype=ext4 --label platform --align 1024
diff --git a/scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg b/scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg
index d5a07d2048..c58e74a853 100644
--- a/scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg
+++ b/scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg
@@ -12,16 +12,16 @@ DEFAULT Graphics console boot
12 12
13LABEL Graphics console boot 13LABEL Graphics console boot
14KERNEL /vmlinuz 14KERNEL /vmlinuz
15APPEND label=boot root=/dev/sda2 rootwait 15APPEND label=boot rootwait
16 16
17LABEL Serial console boot 17LABEL Serial console boot
18KERNEL /vmlinuz 18KERNEL /vmlinuz
19APPEND label=boot root=/dev/sda2 rootwait console=ttyS0,115200 19APPEND label=boot rootwait console=ttyS0,115200
20 20
21LABEL Graphics console install 21LABEL Graphics console install
22KERNEL /vmlinuz 22KERNEL /vmlinuz
23APPEND label=install root=/dev/sda2 rootwait 23APPEND label=install rootwait
24 24
25LABEL Serial console install 25LABEL Serial console install
26KERNEL /vmlinuz 26KERNEL /vmlinuz
27APPEND label=install root=/dev/sda2 rootwait console=ttyS0,115200 27APPEND label=install rootwait console=ttyS0,115200
diff --git a/scripts/lib/wic/canned-wks/qemux86-directdisk.wks b/scripts/lib/wic/canned-wks/qemux86-directdisk.wks
index db30bbced0..1f8466af29 100644
--- a/scripts/lib/wic/canned-wks/qemux86-directdisk.wks
+++ b/scripts/lib/wic/canned-wks/qemux86-directdisk.wks
@@ -4,5 +4,5 @@
4 4
5include common.wks.inc 5include common.wks.inc
6 6
7bootloader --timeout=0 --append="vga=0 uvesafb.mode_option=640x480-32 root=/dev/sda2 rw mem=256M ip=192.168.7.2::192.168.7.1:255.255.255.0 oprofile.timer=1 rootfstype=ext4 " 7bootloader --timeout=0 --append="vga=0 uvesafb.mode_option=640x480-32 rw mem=256M ip=192.168.7.2::192.168.7.1:255.255.255.0 oprofile.timer=1 rootfstype=ext4 "
8 8