[oe-commits] org.oe.dev slugos-init: Add delay to disk booting to cope with module loading

[blaster8 commit]

slugos-init: Add delay to disk booting to cope with module loading

Author: blaster8 at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 11eafc7dd646f2c76d8c21ce224e521730ac6a91
ViewMTN: http://monotone.openembedded.org/revision.psp?id=11eafc7dd646f2c76d8c21ce224e521730ac6a91
Files:
1
packages/slugos-init/files/boot/disk
packages/slugos-init/slugos-init_0.10.bb
Diffs:

#
# mt diff -rd3f331b70e95906af0d505b077734594ec371fee -r11eafc7dd646f2c76d8c21ce224e521730ac6a91
#
# 
# 
# patch "packages/slugos-init/files/boot/disk"
#  from [32b6c2de5106fbad06a1749550260ce1bcfe84d2]
#    to [f56ec1957b54f79a20c086e7895a20ab37b91519]
# 
# patch "packages/slugos-init/slugos-init_0.10.bb"
#  from [24072028aa41929f93c28c6ab7b812f89a207f08]
#    to [2b218e6ec9a401808de24b6e559645e302b1bf80]
# 
============================================================
--- packages/slugos-init/files/boot/disk	32b6c2de5106fbad06a1749550260ce1bcfe84d2
+++ packages/slugos-init/files/boot/disk	f56ec1957b54f79a20c086e7895a20ab37b91519
@@ -16,18 +16,18 @@ then
 then
 	device="$1"
 	shift
-	echo "boot: rootfs: mount $* $device [$UUID]"
-	#
-	# wait if required
+        # proc is needed for UUID mount and module load
+        mount -t proc proc /proc
+        # load USB & SCSI storage modules (/proc required!)
+        echo "boot: loading modules required for disk boot"
+        loaddiskmods
+	# waiting for disk (FIXME)
+	sleep=5
 	test "$sleep" -gt 0 && sleep "$sleep"
 	#
-	# proc is needed for UUID mount
-	mount -t proc proc /proc 
+	# fire the boot
+	echo "boot: rootfs: mount $* $device [$UUID]"
 	#
-	# load USB & SCSI storage modules (/proc required!)
-	echo "boot: loading modules required for boot"
-	loaddiskmods
-	#
 	# Mount read-write because before exec'ing init
 	# If a UUID is given (in the environment) this
 	# is used in preference to the device, but if
============================================================
--- packages/slugos-init/slugos-init_0.10.bb	24072028aa41929f93c28c6ab7b812f89a207f08
+++ packages/slugos-init/slugos-init_0.10.bb	2b218e6ec9a401808de24b6e559645e302b1bf80
@@ -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 = "r69"
+PR = "r70"
 
 SRC_URI = "file://boot/flash \
 	   file://boot/disk \