diff options
| author | Dirk von Suchodoletz | 2009-03-20 12:39:26 +0100 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2009-03-20 12:39:26 +0100 |
| commit | 78a5c9093302e736f1cc870d4a9b5951f54f7ad7 (patch) | |
| tree | fbe39621edd322c4651167550097c78e07677fa4 /initramfs/stage3-stuff/init | |
| parent | Broader selection of windowmanagers, headers added. (diff) | |
| download | core-78a5c9093302e736f1cc870d4a9b5951f54f7ad7.tar.gz core-78a5c9093302e736f1cc870d4a9b5951f54f7ad7.tar.xz core-78a5c9093302e736f1cc870d4a9b5951f54f7ad7.zip | |
Restructured disk/tmp setup to avoid unionfs/aufs hassles of covered
mount points (r2743 didn't fix that).
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2747 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs/stage3-stuff/init')
| -rwxr-xr-x | initramfs/stage3-stuff/init | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/initramfs/stage3-stuff/init b/initramfs/stage3-stuff/init index 75c02e9b..561d11bd 100755 --- a/initramfs/stage3-stuff/init +++ b/initramfs/stage3-stuff/init @@ -663,6 +663,19 @@ runinithook '35-have-network-root' # get the complete collection of kernel modules available mount -n --bind /mnt/lib/modules /lib/modules || error "$init_moddir" +# start hardware configuration as background process if not a special +# debuglevel (21) is used for the option of manual hwautocfg start +if [ ${DEBUGLEVEL} = 21 ] ; then + echo "You can run 'hwautocfg main &' manually now ..." + /bin/ash +else + [ $DEBUGLEVEL -eq 20 ] && echo "** started hwautocfg in background at \ +$(sysup)" + hwautocfg main & +fi + +runinithook '40-started-hw-config' + # unionfs/aufs modules visible by now if installed, try to use aufs for rw # access if available union_type="" @@ -680,18 +693,6 @@ else unset aufs unionfs fi -# start hardware configuration as background process if not a special -# debuglevel (21) is used for the option of manual hwautocfg start -if [ ${DEBUGLEVEL} = 21 ] ; then - echo "You can run 'hwautocfg main &' manually now ..." - /bin/ash -else - [ $DEBUGLEVEL -eq 20 ] && echo "** started hwautocfg in background at \ -$(sysup)" - hwautocfg main & -fi - -runinithook '40-started-hw-config' # runtimer [ $DEBUGLEVEL -eq 8 -o $DEBUGLEVEL -eq 20 ] && \ @@ -712,10 +713,14 @@ if [ -n "${union_type}" ] ; then mkdir -p /mnt/uniontmp mount -n --move ${rwdir}/uniontmp /mnt/uniontmp chmod 0755 /mnt/uniontmp /mnt + # running hardware disk/tmp setup now + hwautocfg disk & # run ldconfig if switched on via kernel command line (token ldsc) or # triggered by unionized root filesystem ldcfg elif [ -z "${cowloop}" ] ; then + # fire up hardware disk/tmp setup first + hwautocfg disk & echo "Using bind mounts to ramdisk for rw access" mount -n -t tmpfs -o size=${tmpfssize} ramfs ${rwdir} for path in ${D_BINDMPTS} ; do |