diff options
| author |   California Sullivan <california.l.sullivan@intel.com> | 2017-08-17 15:47:30 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-19 09:19:12 +0100 |
| commit | a30f8f60017d566d845ee5d3a8cfc338017211b0 (patch) | |
| tree | 2d02a74e2af342d38a768a6f7d4eda7b79d519d2 | |
| parent | 5585103c195104e85ed7ac1455bef91b2e88a04d (diff) | |
| download | openembedded-core-contrib-a30f8f60017d566d845ee5d3a8cfc338017211b0.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.
Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/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 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="" 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 |