From 8ba90ea5e3a8d8c3615631c2042623499dd37ebc Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Thu, 19 Mar 2009 23:56:40 +0000
Subject: Moved the loading of aufs/unionfs modules, hoping to fix the id44 to
 (/mnt)/tmp mounting ...

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2743 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initramfs/stage3-stuff/init | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

(limited to 'initramfs/stage3-stuff/init')

diff --git a/initramfs/stage3-stuff/init b/initramfs/stage3-stuff/init
index af2ef2ca..75c02e9b 100755
--- a/initramfs/stage3-stuff/init
+++ b/initramfs/stage3-stuff/init
@@ -663,21 +663,9 @@ 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=""
-# try to use aufs for rw access if available
 if [ ${aufs} -eq 1 ] && \
    modprobe ${MODPRV} aufs 2>/dev/null && \
    lsmod | grep -qe "^aufs" ; then union_type="AUFS"
@@ -691,10 +679,23 @@ else
   error "$init_loadaufs" nonfatal
   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 ] && \
   echo "** Filesystem setup started at $(sysup)"
-
 # setup of client root filesystem dependent on the availability of UnionFS
 if [ -n "${union_type}" ] ; then
   echo "Using ${union_type} for rw access"
-- 
cgit v1.2.3-55-g7522