summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/initrdscripts
diff options
context:
space:
mode:
authorCalifornia Sullivan <california.l.sullivan@intel.com>2017-08-17 15:47:30 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-19 22:15:39 +0100
commit769c774f899711b6f1626600371f6ff072b19dc1 (patch)
treecaf7dc22c4b30ac0a9c9bbd5699ef3a0c73bdbcb /meta/recipes-core/initrdscripts
parent7a4361c506ac24bafcf294f498d00278f11c3bd4 (diff)
downloadpoky-769c774f899711b6f1626600371f6ff072b19dc1.tar.gz
initramfs-framework/setup-live: also boot live image if root=/dev/ram0
Our grub and syslinux bootloaders both define root=/dev/ram0 for live images by default. Kernel docs show that root=/dev/ram0 is just a sentinel value for the kernel to mount the initrd as root, which then mounts and switches to the real root. This is exactly what our scripts do, so just check for root=/dev/ram0 as well. See: https://www.kernel.org/doc/html/v4.11/admin-guide/initrd.html#operation This fixes the issue where the new initramfs-framework scripts would not boot live images that use grub or syslinux bootloaders. (From OE-Core rev: a30f8f60017d566d845ee5d3a8cfc338017211b0) Signed-off-by: California Sullivan <california.l.sullivan@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/initrdscripts')
-rw-r--r--meta/recipes-core/initrdscripts/initramfs-framework/setup-live2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/setup-live b/meta/recipes-core/initrdscripts/initramfs-framework/setup-live
index 591c93a962..b98a321b89 100644
--- a/meta/recipes-core/initrdscripts/initramfs-framework/setup-live
+++ b/meta/recipes-core/initrdscripts/initramfs-framework/setup-live
@@ -12,7 +12,7 @@ ISOLINUX=""
12ROOT_DISK="" 12ROOT_DISK=""
13shelltimeout=30 13shelltimeout=30
14 14
15 if [ -z $bootparam_root ]; then 15 if [ -z $bootparam_root -o $bootparam_root = "/dev/ram0" ]; then
16 echo "Waiting for removable media..." 16 echo "Waiting for removable media..."
17 C=0 17 C=0
18 while true 18 while true