summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael-Luke Jones <mlj28@cam.ac.uk>2006-09-28 18:15:49 +0000
committerMichael-Luke Jones <mlj28@cam.ac.uk>2006-09-28 18:15:49 +0000
commitdfdac86de873437af6abfb18e2bb7586e0d4ce8c (patch)
tree825b5ffdc83467803b97659c5bf686c09161cdcd
parent0846c33022e583c178c20cf328a7c53fa7f881ab (diff)
slugos-init: Add delay to disk booting to cope with module loading
-rw-r--r--packages/slugos-init/files/boot/disk18
-rw-r--r--packages/slugos-init/slugos-init_0.10.bb2
2 files changed, 10 insertions, 10 deletions
diff --git a/packages/slugos-init/files/boot/disk b/packages/slugos-init/files/boot/disk
index dca1e422aa..17fb1f3243 100644
--- a/packages/slugos-init/files/boot/disk
+++ b/packages/slugos-init/files/boot/disk
@@ -16,17 +16,17 @@ if test -n "$1"
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
- #
- # load USB & SCSI storage modules (/proc required!)
- echo "boot: loading modules required for boot"
- loaddiskmods
+ # fire the boot
+ echo "boot: rootfs: mount $* $device [$UUID]"
#
# Mount read-write because before exec'ing init
# If a UUID is given (in the environment) this
diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb
index d6ce0b5f65..7c8d0fa9f5 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 = "r69"
+PR = "r70"
SRC_URI = "file://boot/flash \
file://boot/disk \