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

diff --git a/packages/slugos-init/files/boot/disk b/packages/slugos-init/files/boot/disk
index ff55baa..a991bc5 100644 (file)
--- 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 ff1397e..556d942 100644 (file)
--- 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 0e32c06..55fea3e 100644 (file)
--- 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 \