[oe-commits] org.oe.dev initramfs-uniboot: Set default rootdelay globally, instead of initramfs-module-bootmenu.
pfalcon commit
openembedded-commits at lists.openembedded.org
Mon Mar 17 08:43:44 UTC 2008
initramfs-uniboot: Set default rootdelay globally, instead of initramfs-module-bootmenu.
* That's because otherwise it's half-solution - after kexec, there won't be
delay, and rootfs won't be detected.
* Again, people who don't need and don't want delay, should pass rootdelay=0.
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 1458e9ca6c6d9b78bff4114c4a3b09c7aa6b7a8e
ViewMTN: http://monotone.openembedded.org/revision/info/1458e9ca6c6d9b78bff4114c4a3b09c7aa6b7a8e
Files:
1
packages/initrdscripts/files/30-bootmenu.sh
packages/initrdscripts/files/init.sh
packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
packages/initrdscripts/initramfs-uniboot_1.0.bb
Diffs:
#
# mt diff -r964b526e0c04a7efb6b0c656617576147da17592 -r1458e9ca6c6d9b78bff4114c4a3b09c7aa6b7a8e
#
#
#
# patch "packages/initrdscripts/files/30-bootmenu.sh"
# from [32135d4222e580fde5519b1a7416ae4f88707d97]
# to [ffda8669f836bece0b3630e338941750baed9d81]
#
# patch "packages/initrdscripts/files/init.sh"
# from [14e96ee63df61b4002240224d1884c5255725646]
# to [f01a2b1d615165dd1f22c6ce448caad76fe2bc21]
#
# patch "packages/initrdscripts/initramfs-module-bootmenu_1.0.bb"
# from [3b8d3a8331be1d3c854c539093fccf5e97c67889]
# to [665b9db27141be2a1f7b3578b4e1576aa298a03d]
#
# patch "packages/initrdscripts/initramfs-uniboot_1.0.bb"
# from [4fe470a93794e0f45af8847e573847a31394b771]
# to [78c83e65d5b0b78fe7b0e40ddc388dbae7d00c06]
#
============================================================
--- packages/initrdscripts/files/30-bootmenu.sh 32135d4222e580fde5519b1a7416ae4f88707d97
+++ packages/initrdscripts/files/30-bootmenu.sh ffda8669f836bece0b3630e338941750baed9d81
@@ -15,13 +15,6 @@ fi
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=""
============================================================
--- packages/initrdscripts/files/init.sh 14e96ee63df61b4002240224d1884c5255725646
+++ packages/initrdscripts/files/init.sh f01a2b1d615165dd1f22c6ce448caad76fe2bc21
@@ -67,6 +67,11 @@ read_args
read_args
+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"
+ rootdelay="2"
+fi
if [ -n "$rootdelay" ]; then
echo "Waiting $rootdelay seconds for devices to settle..." >$CONSOLE
sleep $rootdelay
============================================================
--- packages/initrdscripts/initramfs-module-bootmenu_1.0.bb 3b8d3a8331be1d3c854c539093fccf5e97c67889
+++ packages/initrdscripts/initramfs-module-bootmenu_1.0.bb 665b9db27141be2a1f7b3578b4e1576aa298a03d
@@ -1,5 +1,5 @@ SRC_URI = "file://30-bootmenu.sh"
SRC_URI = "file://30-bootmenu.sh"
-PR = "r16"
+PR = "r17"
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.
============================================================
--- packages/initrdscripts/initramfs-uniboot_1.0.bb 4fe470a93794e0f45af8847e573847a31394b771
+++ packages/initrdscripts/initramfs-uniboot_1.0.bb 78c83e65d5b0b78fe7b0e40ddc388dbae7d00c06
@@ -1,5 +1,5 @@ SRC_URI = "file://init.sh"
SRC_URI = "file://init.sh"
-PR = "r7"
+PR = "r8"
DESCRIPTON = "A modular initramfs init script system."
RRECOMMENDS = "kernel-module-mtdblock"
More information about the Openembedded-commits
mailing list