From 84c5f5d53e3417913c75df26cf33678efe0a148e Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Sun, 9 Mar 2008 01:41:02 +0000
Subject: 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.

---
 packages/initrdscripts/files/30-bootmenu.sh | 7 -------
 packages/initrdscripts/files/init.sh        | 5 +++++
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'packages/initrdscripts/files')

diff --git a/packages/initrdscripts/files/30-bootmenu.sh b/packages/initrdscripts/files/30-bootmenu.sh
index 283daadd44..c77bd662af 100644
--- a/packages/initrdscripts/files/30-bootmenu.sh
+++ b/packages/initrdscripts/files/30-bootmenu.sh
@@ -15,13 +15,6 @@ 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/files/init.sh b/packages/initrdscripts/files/init.sh
index 06b9119a1c..60d2e5da8b 100644
--- a/packages/initrdscripts/files/init.sh
+++ b/packages/initrdscripts/files/init.sh
@@ -67,6 +67,11 @@ load_modules '0*'
 
 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
-- 
cgit v1.2.3