[oe-commits] [openembedded-core] 06/08: initramfs-framework/setup-live: also boot live image if root=/dev/ram0

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit a30f8f60017d566d845ee5d3a8cfc338017211b0
Author: California Sullivan <california.l.sullivan at intel.com>
AuthorDate: Thu Aug 17 15:47:30 2017 -0700

    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.
    
    Signed-off-by: California Sullivan <california.l.sullivan at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-core/initrdscripts/initramfs-framework/setup-live | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/setup-live b/meta/recipes-core/initrdscripts/initramfs-framework/setup-live
index 591c93a..b98a321 100644
--- a/meta/recipes-core/initrdscripts/initramfs-framework/setup-live
+++ b/meta/recipes-core/initrdscripts/initramfs-framework/setup-live
@@ -12,7 +12,7 @@ ISOLINUX=""
 ROOT_DISK=""
 shelltimeout=30
 
-	if [ -z $bootparam_root ]; then
+	if [ -z $bootparam_root -o $bootparam_root = "/dev/ram0" ]; then
 		echo "Waiting for removable media..."
 		C=0
 		while true

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.