[oe-commits] org.oe.dev slugos-init: turnup disk -s<n> fixed, default delay set to 10 secs

[mwester commit]

slugos-init: turnup disk -s<n> fixed, default delay set to 10 secs

Author: mwester at openembedded.org
Branch: org.openembedded.dev
Revision: 6b385aa937756d61423605d5e3e62a25f90cbcd9
ViewMTN: http://monotone.openembedded.org/revision.psp?id=6b385aa937756d61423605d5e3e62a25f90cbcd9
Files:
1
packages/slugos-init/files/boot/disk
packages/slugos-init/files/turnup
packages/slugos-init/slugos-init_0.10.bb
Diffs:

#
# mt diff -r7e7ed9d67124a14ad5241aee82477195eab5b127 -r6b385aa937756d61423605d5e3e62a25f90cbcd9
#
# 
# 
# patch "packages/slugos-init/files/boot/disk"
#  from [02fc53a27db8311869e417f1eaa589cc0e299877]
#    to [f2366a1ad9a01480465e9c24bdea3e18af4064e8]
# 
# patch "packages/slugos-init/files/turnup"
#  from [7ffadb071a67566d576f2b4d4882f7a842e543b6]
#    to [ddb31542c5e4a8c055b1dc685e77e98178f83323]
# 
# patch "packages/slugos-init/slugos-init_0.10.bb"
#  from [52893a4253092e6bf5a7a70dfcb461a8cb4b31ae]
#    to [25cf16441617cdb375a950791a4b42a3aa5bfa82]
# 
============================================================
--- packages/slugos-init/files/boot/disk	02fc53a27db8311869e417f1eaa589cc0e299877
+++ packages/slugos-init/files/boot/disk	f2366a1ad9a01480465e9c24bdea3e18af4064e8
@@ -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]"
============================================================
--- packages/slugos-init/files/turnup	7ffadb071a67566d576f2b4d4882f7a842e543b6
+++ packages/slugos-init/files/turnup	ddb31542c5e4a8c055b1dc685e77e98178f83323
@@ -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
============================================================
--- packages/slugos-init/slugos-init_0.10.bb	52893a4253092e6bf5a7a70dfcb461a8cb4b31ae
+++ packages/slugos-init/slugos-init_0.10.bb	25cf16441617cdb375a950791a4b42a3aa5bfa82
@@ -1,10 +1,10 @@ RDEPENDS = "busybox devio"
 DESCRIPTION = "SlugOS initial network config via sysconf"
 SECTION = "base"
 PRIORITY = "required"
 LICENSE = "GPL"
 DEPENDS = "base-files devio"
 RDEPENDS = "busybox devio"
-PR = "r78"
+PR = "r79"
 
 SRC_URI = "file://boot/flash \
 	   file://boot/disk \