From 56e578c4af12fd077dbe2763be07e877849932e1 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Tue, 3 Mar 2009 20:47:20 +0000
Subject: Rearranging init-hooks to add a special network bridge hook.

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

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

diff --git a/initramfs/stage3-stuff/init b/initramfs/stage3-stuff/init
index 118e0188..6f7a37c5 100755
--- a/initramfs/stage3-stuff/init
+++ b/initramfs/stage3-stuff/init
@@ -296,8 +296,6 @@ in $0\n# deprecated: please use rootfs=nfs://...\nnfsserver=\"${nfsserver}\"\
     # be distinguished from other (dhcp) clients
     vci=*)
       vci=${opts#vci=};;
-    xenbr)
-      xenbr=1;;
   esac
 done
 
@@ -395,6 +393,9 @@ if strinstr "eth" "$nwif" ; then
     fi
   done
 fi
+# hook to setup bridging (several virtualization tools ...)
+# xenbr_config
+runinithook '20-nw-bridge-config'
 
 # set up loopback networking
 [ $DEBUGLEVEL -eq 20 ] && echo "** starting ip config at $(sysup)"
@@ -402,10 +403,6 @@ ip link set dev lo up 2>/dev/null
 ip addr add 127.0.0.1/8 dev lo 2>/dev/null
 ip link set dev $nwif up  2>/dev/null || error "$init_noeth"
 
-# XEN bridge config (fixme: should be moved to plugin a special hook might be 
-# needed at this point)
-[ -n "$xenbr" ] && xenbr_config
-
 # analyze ip information from the kernel command line and put parts
 # of it into several variables
 if [ -n "$ipinfo" ] ; then
@@ -476,7 +473,7 @@ done
 # ... or via (t)ftp/http file get (in background)
 [ -n "$file" ] && fileget &
 
-runinithook '15-have-ip-config'
+runinithook '25-have-ip-config'
 
 # if root filesystem should be imported via local or a network block device
 if [ -n "${bldmod}" ] ; then
@@ -662,7 +659,7 @@ if [ -z "${bldmod}" -a -z "${bldserver}" ] ; then
   [ $DEBUGLEVEL -eq 20 ] && echo "** finished nfs mount at $(sysup)"
 fi
 
-runinithook '20-have-network-root'
+runinithook '35-have-network-root'
 
 # get the complete collection of kernel modules available
 mount -n --bind /mnt/lib/modules/${KERNEL} /lib/modules/${KERNEL} || \
@@ -678,7 +675,7 @@ $(sysup)"
   hwautocfg main &
 fi
 
-runinithook '25-started-hw-config'
+runinithook '40-started-hw-config'
 
 union_type=""
 # try to use unionfs for rw access if available
-- 
cgit v1.2.3-55-g7522