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
---
 .../bootsplash/init-hooks/15-have-ip-config/bootsplash.sh    |  1 -
 .../bootsplash/init-hooks/25-have-ip-config/bootsplash.sh    |  1 +
 .../bootsplash/init-hooks/25-have-network-root/bootsplash.sh |  1 -
 .../bootsplash/init-hooks/35-have-network-root/bootsplash.sh |  1 +
 os-plugins/plugins/vmchooser/files/run-virt.sh               | 12 ++++++------
 5 files changed, 8 insertions(+), 8 deletions(-)
 delete mode 100644 os-plugins/plugins/bootsplash/init-hooks/15-have-ip-config/bootsplash.sh
 create mode 100644 os-plugins/plugins/bootsplash/init-hooks/25-have-ip-config/bootsplash.sh
 delete mode 100644 os-plugins/plugins/bootsplash/init-hooks/25-have-network-root/bootsplash.sh
 create mode 100644 os-plugins/plugins/bootsplash/init-hooks/35-have-network-root/bootsplash.sh

(limited to 'os-plugins/plugins')

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-ip-config/bootsplash.sh b/os-plugins/plugins/bootsplash/init-hooks/25-have-ip-config/bootsplash.sh
new file mode 100644
index 00000000..be6ac567
--- /dev/null
+++ b/os-plugins/plugins/bootsplash/init-hooks/25-have-ip-config/bootsplash.sh
@@ -0,0 +1 @@
+[ ${no_bootsplash} -eq 0 ] && /bin/splashy_update "progress 25" >/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
deleted file mode 100644
index be6ac567..00000000
--- a/os-plugins/plugins/bootsplash/init-hooks/25-have-network-root/bootsplash.sh
+++ /dev/null
@@ -1 +0,0 @@
-[ ${no_bootsplash} -eq 0 ] && /bin/splashy_update "progress 25" >/dev/null 2>&1
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
-- 
cgit v1.2.3-55-g7522