[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7303/8267] initramfs-framework/setup-live: also boot live image if root=/dev/ram0



commit 769c774f899711b6f1626600371f6ff072b19dc1
Author: California Sullivan <california l sullivan intel com>
Date:   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.
    
    (From OE-Core rev: a30f8f60017d566d845ee5d3a8cfc338017211b0)
    
    Signed-off-by: California Sullivan <california l sullivan intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 .../initrdscripts/initramfs-framework/setup-live   |    2 +-
 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 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


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]