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

5 files changed, 13 insertions, 16 deletions

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
diff --git a/os-plugins/plugins/bootsplash/init-hooks/15-have-ip-config/bootsplash.sh b/os-plugins/plugins/bootsplash/init-hooks/15-have-ip-config/bootsplash.sh
deleted file mode 100644
index 8df98b22..00000000
--- a/os-plugins/plugins/bootsplash/init-hooks/15-have-ip-config/bootsplash.sh
+++ /dev/null
@@ -1 +0,0 @@
-[ ${no_bootsplash} -eq 0 ] && /bin/splashy_update "progress 15" >/dev/null 2>&1
diff --git a/os-plugins/plugins/bootsplash/init-hooks/25-have-network-root/bootsplash.sh b/os-plugins/plugins/bootsplash/init-hooks/25-have-ip-config/bootsplash.sh
index be6ac567..be6ac567 100644
--- a/os-plugins/plugins/bootsplash/init-hooks/25-have-network-root/bootsplash.sh
+++ b/os-plugins/plugins/bootsplash/init-hooks/25-have-ip-config/bootsplash.sh
diff --git a/os-plugins/plugins/bootsplash/init-hooks/35-have-network-root/bootsplash.sh b/os-plugins/plugins/bootsplash/init-hooks/35-have-network-root/bootsplash.sh
new file mode 100644
index 00000000..606eb694
--- /dev/null
+++ b/os-plugins/plugins/bootsplash/init-hooks/35-have-network-root/bootsplash.sh
@@ -0,0 +1 @@
+[ ${no_bootsplash} -eq 0 ] && /bin/splashy_update "progress 35" >/dev/null 2>&1
diff --git a/os-plugins/plugins/vmchooser/files/run-virt.sh b/os-plugins/plugins/vmchooser/files/run-virt.sh
index 005bf8f8..c699cc2a 100644
--- a/os-plugins/plugins/vmchooser/files/run-virt.sh
+++ b/os-plugins/plugins/vmchooser/files/run-virt.sh
@@ -21,11 +21,11 @@
 # Sanity checks
 ###############################################################################
 
-# check for running in graphical environment otherwise no much use here
+# Theck for running in graphical environment otherwise no much use here
 [ -z "$DISPLAY" ] && echo -e "\n\tStart only within a graphical desktop!\n" \
   && exit 1
 
-# test if the xml path/file is valid (gotten via commandline first parameter)
+# Test if the xml path/file is valid (gotten via commandline first parameter)
 xml=$1
 [ -e "${xml}" ] || { echo -e "\n\tNo XML file given!\n"; exit 1; }
 
@@ -122,7 +122,7 @@ filecheck ()
   noimage=$(echo ${filecheck} | grep -i "no such file or directory" | wc -l)
   rightsfile=${diskfile}
 
-  # check if link
+  # Check if link
   if [ -L "${diskfile}" ]; then
     # take link target
     rightsfile=$(ls -lh ${diskfile} 2>&1 | awk -F "-> *" '{print $2}')
@@ -130,7 +130,7 @@ filecheck ()
     filecheck=$(LANG=us ls -lh ${rightsfile} 2>&1)
   fi
 
-  # does file exist
+  # Does file exist
   if [ "${noimage}" -ge "1" ]; then
     writelog "Virtual Machine Image Problem:\c "
     writelog "\tThe image you've specified doesn't exist."
@@ -141,7 +141,7 @@ filecheck ()
     exit 1
   fi
 
-  # readable by calling user
+  # Readable by calling user
   if ! [ -r "${diskfile}" >/dev/null 2>&1 \
     -o -r "${diskfile}" >/dev/null 2>&1 ]; then
     writelog "Vmware Image Problem:\c "
@@ -152,7 +152,7 @@ filecheck ()
     exit 1
   fi
 
-  # writable (for persistent-mode)?
+  # Writable (for persistent-mode)?
   if ! [ -w "${diskfile}" >/dev/null 2>&1 \
     -o -w "${diskfile}" >/dev/null 2>&1 ] \
     && [ "${np}" = "independent-persistent" ]; then