summaryrefslogtreecommitdiffstats
path: root/initramfs/stage3-stuff/bin/hwautocfg
diff options
context:
space:
mode:
authorDirk von Suchodoletz2009-07-30 22:56:30 +0200
committerDirk von Suchodoletz2009-07-30 22:56:30 +0200
commite038d32759656ea67c45688c95fa9aed0d96913f (patch)
tree9b0dc09b41e9ebeaac8bc3e135c81c643e477880 /initramfs/stage3-stuff/bin/hwautocfg
parentnew version of vmchooser binary imported: (diff)
downloadcore-e038d32759656ea67c45688c95fa9aed0d96913f.tar.gz
core-e038d32759656ea67c45688c95fa9aed0d96913f.tar.xz
core-e038d32759656ea67c45688c95fa9aed0d96913f.zip
Timing issue in disk configuration.
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@3041 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs/stage3-stuff/bin/hwautocfg')
-rwxr-xr-xinitramfs/stage3-stuff/bin/hwautocfg10
1 files changed, 7 insertions, 3 deletions
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 || \