From 03727f56ee88df4ea41213414c1f49c00984cf34 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sat, 8 Mar 2008 18:21:54 +0000 Subject: initramfs-module-bootmenu: If rootdelay= param was not passed, assume 2s delay still. * So people who don't bother to set correct rootdelay still have good chance for there SD/CF cards detected. * To disable the feature, explicit rootdelay=0 should be passed on kernel command line. --- packages/initrdscripts/files/30-bootmenu.sh | 7 +++++++ packages/initrdscripts/initramfs-module-bootmenu_1.0.bb | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/initrdscripts/files/30-bootmenu.sh b/packages/initrdscripts/files/30-bootmenu.sh index 9960fbf34e..f5ecb8c828 100644 --- a/packages/initrdscripts/files/30-bootmenu.sh +++ b/packages/initrdscripts/files/30-bootmenu.sh @@ -15,6 +15,13 @@ if ! (echo " " | read -n1 foo) >/dev/null 2>&1; then exit 1 fi +if [ -z "$rootdelay" ]; then + echo "rootdelay parameter was not passed on kernel command line - assuming 2s delay" + echo "If you would like to avoid this delay, pass explicit rootdelay=0" + sleep 2 + dev_setup +fi + mkdir -p $MOUNTLOC list="" diff --git a/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb b/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb index 4f9fba6511..6c01b5edc5 100644 --- a/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb +++ b/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb @@ -1,5 +1,5 @@ SRC_URI = "file://30-bootmenu.sh" -PR = "r14" +PR = "r15" DESCRIPTION = "An initramfs module with UI for selection of boot device." RDEPENDS = "klibc-utils-static-fstype initramfs-uniboot initramfs-module-block initramfs-module-loop initramfs-module-nfs" # For VFAT mounting. -- cgit v1.2.3