From e038d32759656ea67c45688c95fa9aed0d96913f Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Thu, 30 Jul 2009 20:56:30 +0000
Subject: Timing issue in disk configuration.

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@3041 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initramfs/stage3-stuff/bin/hwautocfg | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'initramfs/stage3-stuff/bin/hwautocfg')

diff --git a/initramfs/stage3-stuff/bin/hwautocfg b/initramfs/stage3-stuff/bin/hwautocfg
index 6dedda77..ca436f3b 100755
--- a/initramfs/stage3-stuff/bin/hwautocfg
+++ b/initramfs/stage3-stuff/bin/hwautocfg
@@ -147,13 +147,15 @@ noexec\t 0 0" >>/tmp/fstab
           # if more than one id45 present, the latter ones are simply mounted
           # over the previous (the mounts are postponed a bit via do_mnt to
           # have the filesystem completely prepared) 
-          echo -e "mount -t auto $hdpartnr /mnt/media/${hdpartnr#/dev/*}\n\
+          echo -e "waitfor $hdpartnr 4000\n\
+            mount -t auto $hdpartnr /mnt/media/${hdpartnr#/dev/*}\n\
             ln -sf /media/${hdpartnr#/dev/*} /mnt/var/scratch" >>/etc/do_mnt
           echo -e "$hdpartnr\t/media/${hdpartnr#/dev/*}\tauto\t\tnoauto\
 \t\t 0 0" >>/tmp/fstab
         elif [ ${partid} -eq 46 ] ; then
           # mount a home directory to (/mnt)/var/home
-          echo -e "mount -t auto $hdpartnr /mnt/media/${hdpartnr#/dev/*} \n\
+          echo -e "waitfor $hdpartnr 4000\n\
+            mount -t auto $hdpartnr /mnt/media/${hdpartnr#/dev/*} \n\
             test -d /mnt/media/${hdpartnr#/dev/*}/home && \
               ln -sf /media/${hdpartnr#/dev/*} /mnt/var/home" >>/etc/do_mnt
           echo -e "$hdpartnr\t/media/${hdpartnr#/dev/*}\tauto\t\tnoauto,\
@@ -161,6 +163,8 @@ noexec\t 0 0" >>/tmp/fstab
         fi
       done
     done
+    # add 
+    [ -f /etc/do_mnt ] && sed -e "1i. /etc/functions" -i /etc/do_mnt
   done
   # determine if tmp preparation should wait for format/mount or not
   [ -z "$part44" ] && echo "finished at $(sysup)" >/tmp/tmpready
@@ -175,7 +179,7 @@ fi
 finish () {
 mdev -s
 # mount filesystem parts requested in disk setup
-ash /etc/do_mnt
+ash /etc/do_mnt &
 # remove unneeded disk and mouse drivers
 [ ! -s /etc/hwinfo.disk ] && rmmod sd_mod 2>/dev/null
 #grep -q " PS/2 " /etc/hwinfo.mouse || \
-- 
cgit v1.2.3-55-g7522