From 7a16bd778b113b30a7e6dd05fd4324c1344c36de Mon Sep 17 00:00:00 2001
From: Mike Westerhof <mwester@dls.net>
Date: Wed, 21 Feb 2007 06:42:23 +0000
Subject: slugos-init: turnup disk -s<n> fixed, default delay set to 10 secs

---
 packages/slugos-init/files/boot/disk     | 9 ++++++---
 packages/slugos-init/files/turnup        | 2 +-
 packages/slugos-init/slugos-init_0.10.bb | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/packages/slugos-init/files/boot/disk b/packages/slugos-init/files/boot/disk
index ff55baa04c..a991bc50ac 100644
--- a/packages/slugos-init/files/boot/disk
+++ b/packages/slugos-init/files/boot/disk
@@ -21,9 +21,12 @@ then
         # load USB & SCSI storage modules (/proc required!)
         echo "boot: loading modules required for disk boot"
         loaddiskmods
-	# waiting for disk (FIXME)
-	sleep=6
-	test "$sleep" -gt 0 && sleep "$sleep"
+	# waiting for disk
+	if test "$sleep" -gt 0
+	then
+		echo "Waiting $sleep seconds for disk"
+		sleep "$sleep"
+	fi
 	#
 	# fire the boot
 	echo "boot: rootfs: mount $* $device [$UUID]"
diff --git a/packages/slugos-init/files/turnup b/packages/slugos-init/files/turnup
index ff1397e4c1..556d942e26 100644
--- a/packages/slugos-init/files/turnup
+++ b/packages/slugos-init/files/turnup
@@ -450,7 +450,7 @@ disk() {
 	local setup_type sleep init device uuid new ffs fst fso
 
 	setup_type=disk
-	sleep=0
+	sleep=10
 	init=
 	while test $# -gt 0
 	do
diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb
index 0e32c06b34..55fea3e120 100644
--- a/packages/slugos-init/slugos-init_0.10.bb
+++ b/packages/slugos-init/slugos-init_0.10.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
 LICENSE = "GPL"
 DEPENDS = "base-files devio"
 RDEPENDS = "busybox devio"
-PR = "r78"
+PR = "r79"
 
 SRC_URI = "file://boot/flash \
 	   file://boot/disk \
-- 
cgit v1.2.3