* revert to r2302 / remove plugin env variables workaround

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2313 95ad53e4-c205-0410-b2fa-d234c58c8868

15 files changed, 23 insertions, 21 deletions

diff --git a/os-plugins/plugins/bootsplash/XX_bootsplash.sh b/os-plugins/plugins/bootsplash/XX_bootsplash.sh
index da718b22..4bd340fb 100644
--- a/os-plugins/plugins/bootsplash/XX_bootsplash.sh
+++ b/os-plugins/plugins/bootsplash/XX_bootsplash.sh
@@ -17,7 +17,7 @@
 if [ -e /initramfs/plugin-conf/bootsplash.conf ]; then
   . /initramfs/plugin-conf/bootsplash.conf
   if [ $bootsplash_active -ne 0 ]; then
-    if [ -e /tmp/bootsplash ]; then
+    if [ ${no_bootsplash} -eq 0 ]; then
       # create a runlevelscript that will stop splashy before the start of KDM
       d_mkrlscript init splashy.stop "Stopping Splashy ..."
         echo -e "\t/opt/openslx/plugin-repo/bootsplash/bin/splashy_update.glibc\
diff --git a/os-plugins/plugins/bootsplash/init-hooks/05-have-kernelvars/bootsplash.sh b/os-plugins/plugins/bootsplash/init-hooks/05-have-kernelvars/bootsplash.sh
index 6ccbd9f0..e69900ce 100644
--- a/os-plugins/plugins/bootsplash/init-hooks/05-have-kernelvars/bootsplash.sh
+++ b/os-plugins/plugins/bootsplash/init-hooks/05-have-kernelvars/bootsplash.sh
@@ -5,9 +5,13 @@ if grep -E "(VESA|VGA)" /proc/fb > /dev/null 2>&1 \
     > /dev/null 2>&1 \
   && [ $DEBUGLEVEL -eq 0 ] \
   && [ -e /bin/splashy ] ; then
-    echo "we have bootsplash" >/tmp/bootsplash
-    /bin/splashy boot 2>/dev/null
-    # add splashy.stop runlevel script (does not work any more here,
-    # temporarily moved to init awaiting a proper solution)
-    #D_SPLASHY=splashy.stop
+    export no_bootsplash=0
+else
+  export no_bootsplash=1
+fi
+
+if [ ${no_bootsplash} -eq 0 ]; then
+  /bin/splashy boot 2>/dev/null
+  # add splashy.stop runlevel script
+  export D_SPLASHY=splashy.stop
 fi
diff --git a/os-plugins/plugins/bootsplash/init-hooks/10-have-nw-modules/bootsplash.sh b/os-plugins/plugins/bootsplash/init-hooks/10-have-nw-modules/bootsplash.sh
index 90447302..7f3d563e 100644
--- a/os-plugins/plugins/bootsplash/init-hooks/10-have-nw-modules/bootsplash.sh
+++ b/os-plugins/plugins/bootsplash/init-hooks/10-have-nw-modules/bootsplash.sh
@@ -1 +1 @@
-[ -e /tmp/bootsplash ] && /bin/splashy_update "progress 10" >/dev/null 2>&1
+[ ${no_bootsplash} -eq 0 ] && /bin/splashy_update "progress 10" >/dev/null 2>&1
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
index a7d0672f..8df98b22 100644
--- 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
@@ -1 +1 @@
-[ -e /tmp/bootsplash ] && /bin/splashy_update "progress 15" >/dev/null 2>&1
+[ ${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-network-root/bootsplash.sh
index eeea566c..be6ac567 100644
--- a/os-plugins/plugins/bootsplash/init-hooks/25-have-network-root/bootsplash.sh
+++ b/os-plugins/plugins/bootsplash/init-hooks/25-have-network-root/bootsplash.sh
@@ -1 +1 @@
-[ -e /tmp/bootsplash ] && /bin/splashy_update "progress 25" >/dev/null 2>&1
+[ ${no_bootsplash} -eq 0 ] && /bin/splashy_update "progress 25" >/dev/null 2>&1
diff --git a/os-plugins/plugins/bootsplash/init-hooks/40-started-hw-config/bootsplash.sh b/os-plugins/plugins/bootsplash/init-hooks/40-started-hw-config/bootsplash.sh
index 1273e3ac..d5fc62ec 100644
--- a/os-plugins/plugins/bootsplash/init-hooks/40-started-hw-config/bootsplash.sh
+++ b/os-plugins/plugins/bootsplash/init-hooks/40-started-hw-config/bootsplash.sh
@@ -1 +1 @@
-[ -e /tmp/bootsplash ] && /bin/splashy_update "progress 40" >/dev/null 2>&1
+[ ${no_bootsplash} -eq 0 ] && /bin/splashy_update "progress 40" >/dev/null 2>&1
diff --git a/os-plugins/plugins/bootsplash/init-hooks/50-have-layered-fs/bootsplash.sh b/os-plugins/plugins/bootsplash/init-hooks/50-have-layered-fs/bootsplash.sh
index b283dfb3..4b7e9c78 100644
--- a/os-plugins/plugins/bootsplash/init-hooks/50-have-layered-fs/bootsplash.sh
+++ b/os-plugins/plugins/bootsplash/init-hooks/50-have-layered-fs/bootsplash.sh
@@ -1 +1 @@
-[ -e /tmp/bootsplash ] && /bin/splashy_update "progress 50" >/dev/null 2>&1
+[ ${no_bootsplash} -eq 0 ] && /bin/splashy_update "progress 50" >/dev/null 2>&1
diff --git a/os-plugins/plugins/bootsplash/init-hooks/60-have-servconfig/bootsplash.sh b/os-plugins/plugins/bootsplash/init-hooks/60-have-servconfig/bootsplash.sh
index 4d71a4f4..9c3bd20f 100644
--- a/os-plugins/plugins/bootsplash/init-hooks/60-have-servconfig/bootsplash.sh
+++ b/os-plugins/plugins/bootsplash/init-hooks/60-have-servconfig/bootsplash.sh
@@ -1 +1 @@
-[ -e /tmp/bootsplash ] && /bin/splashy_update "progress 60" >/dev/null 2>&1
+[ ${no_bootsplash} -eq 0 ] && /bin/splashy_update "progress 60" >/dev/null 2>&1
diff --git a/os-plugins/plugins/bootsplash/init-hooks/70-before-plugins/bootsplash.sh b/os-plugins/plugins/bootsplash/init-hooks/70-before-plugins/bootsplash.sh
index 911a1be6..fcd0c410 100644
--- a/os-plugins/plugins/bootsplash/init-hooks/70-before-plugins/bootsplash.sh
+++ b/os-plugins/plugins/bootsplash/init-hooks/70-before-plugins/bootsplash.sh
@@ -1 +1 @@
-[ -e /tmp/bootsplash ] && /bin/splashy_update "progress 70" >/dev/null 2>&1
+[ ${no_bootsplash} -eq 0 ] && /bin/splashy_update "progress 70" >/dev/null 2>&1
diff --git a/os-plugins/plugins/bootsplash/init-hooks/80-after-plugins/bootsplash.sh b/os-plugins/plugins/bootsplash/init-hooks/80-after-plugins/bootsplash.sh
index 4efa1efb..0abfa5b2 100644
--- a/os-plugins/plugins/bootsplash/init-hooks/80-after-plugins/bootsplash.sh
+++ b/os-plugins/plugins/bootsplash/init-hooks/80-after-plugins/bootsplash.sh
@@ -1 +1 @@
-[ -e /tmp/bootsplash ] && /bin/splashy_update "progress 80" >/dev/null 2>&1
+[ ${no_bootsplash} -eq 0 ] && /bin/splashy_update "progress 80" >/dev/null 2>&1
diff --git a/os-plugins/plugins/bootsplash/init-hooks/85-have-initial-boot/bootsplash.sh b/os-plugins/plugins/bootsplash/init-hooks/85-have-initial-boot/bootsplash.sh
index 7812f608..8738e454 100644
--- a/os-plugins/plugins/bootsplash/init-hooks/85-have-initial-boot/bootsplash.sh
+++ b/os-plugins/plugins/bootsplash/init-hooks/85-have-initial-boot/bootsplash.sh
@@ -1 +1 @@
-[ -e /tmp/bootsplash ] && /bin/splashy_update "progress 85" >/dev/null 2>&1
+[ ${no_bootsplash} -eq 0 ] && /bin/splashy_update "progress 85" >/dev/null 2>&1
diff --git a/os-plugins/plugins/bootsplash/init-hooks/90-postinit-done/bootsplash.sh b/os-plugins/plugins/bootsplash/init-hooks/90-postinit-done/bootsplash.sh
index 61d07b9f..2546d298 100644
--- a/os-plugins/plugins/bootsplash/init-hooks/90-postinit-done/bootsplash.sh
+++ b/os-plugins/plugins/bootsplash/init-hooks/90-postinit-done/bootsplash.sh
@@ -1 +1 @@
-[ -e /tmp/bootsplash ] && /bin/splashy_update "progress 90" >/dev/null 2>&1
+[ ${no_bootsplash} -eq 0 ] && /bin/splashy_update "progress 90" >/dev/null 2>&1
diff --git a/os-plugins/plugins/bootsplash/init-hooks/95-cleanup/bootsplash.sh b/os-plugins/plugins/bootsplash/init-hooks/95-cleanup/bootsplash.sh
index 51d90b69..5ff86715 100644
--- a/os-plugins/plugins/bootsplash/init-hooks/95-cleanup/bootsplash.sh
+++ b/os-plugins/plugins/bootsplash/init-hooks/95-cleanup/bootsplash.sh
@@ -1 +1 @@
-[ -e /tmp/bootsplash ] && /bin/splashy_update "progress 95" >/dev/null 2>&1
+[ ${no_bootsplash} -eq 0 ] && /bin/splashy_update "progress 95" >/dev/null 2>&1
diff --git a/os-plugins/plugins/bootsplash/init-hooks/99-handing-over/bootsplash.sh b/os-plugins/plugins/bootsplash/init-hooks/99-handing-over/bootsplash.sh
index 72c664c6..93673915 100644
--- a/os-plugins/plugins/bootsplash/init-hooks/99-handing-over/bootsplash.sh
+++ b/os-plugins/plugins/bootsplash/init-hooks/99-handing-over/bootsplash.sh
@@ -1 +1 @@
-[ -e /tmp/bootsplash ] && /bin/splashy_update "progress 100" >/dev/null 2>&1
+[ ${no_bootsplash} -eq 0 ] && /bin/splashy_update "progress 100" >/dev/null 2>&1
diff --git a/os-plugins/plugins/xen/init-hooks/10-have-nw-modules/xen.sh b/os-plugins/plugins/xen/init-hooks/10-have-nw-modules/xen.sh
index 35b4bb57..321b6a06 100644
--- a/os-plugins/plugins/xen/init-hooks/10-have-nw-modules/xen.sh
+++ b/os-plugins/plugins/xen/init-hooks/10-have-nw-modules/xen.sh
@@ -1,7 +1,5 @@
 # configure Xen bridge xenbr0
-# checkme/fixme: parts of the variables might be missing because of the new
-# inithook-wrapper, see ticket #259
-modprobe netloop
+modprobe ${MODPRV} netloop
 local ipls
 local vifnum="0"
 local bridge="xenbr${vifnum}"