Split VPS into VSERVER and OPENVZ

7 files changed, 7 insertions, 10 deletions

diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in
index f98cf6b..08f9cc5 100644
--- a/init.d/bootmisc.in
+++ b/init.d/bootmisc.in
@@ -113,7 +113,7 @@ start()
 	[ -x /sbin/restorecon ] && restorecon /tmp/.ICE-unix /tmp/.X11-unix
 
 	# Create an 'after-boot' dmesg log
-	if [ "${RC_SYS}" != "VPS" ]; then
+	if [ "${RC_SYS}" != "VSERVER" -a "${RC_SYS}" != "OPENVZ" ]; then
 		dmesg > /var/log/dmesg
 		chmod 640 /var/log/dmesg
 	fi
diff --git a/init.d/fsck.in b/init.d/fsck.in
index 61aa947..967eee3 100644
--- a/init.d/fsck.in
+++ b/init.d/fsck.in
@@ -9,7 +9,7 @@ _ISF="
 depend()
 {
 	after clock modules
-	keyword nojail noprefix notimeout
+	keyword nojail noopenvz noprefix notimeout novserver
 }
 
 _abort() {
diff --git a/init.d/halt.sh.in b/init.d/halt.sh.in
index 39dd4f4..dca6815 100644
--- a/init.d/halt.sh.in
+++ b/init.d/halt.sh.in
@@ -27,7 +27,7 @@ sync; sync
 # If we are in a VPS, we don't need anything below here, because
 #   1) we don't need (and by default can't) umount anything (VServer) or
 #   2) the host utils take care of all umounting stuff (OpenVZ)
-if [ "${RC_SYS}" = "VPS" ]; then
+if [ "${RC_SYS}" = "VSERVER" -o "${RC_SYS}" = "OPENVZ" ]; then
 	if [ -e /etc/init.d/"$1".sh ]; then
 		. /etc/init.d/"$1".sh
 	else
diff --git a/init.d/localmount.in b/init.d/localmount.in
index 4c7d5fd..9d95a8a 100644
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -8,7 +8,7 @@ depend()
 {
 	need fsck
 	use modules mtab
-	keyword nojail noprefix
+	keyword nojail noopenvz noprefix novserver
 }
 
 start()
@@ -29,9 +29,6 @@ start()
 
 stop()
 {
-	# Don't unmount anything for VPS systems
-	[ "${RC_SYS}" = "VPS" ] && return 0
-
 	# We never unmount / or /dev or $RC_SVCDIR
 	local x= no_umounts="/|/dev|/dev/.*|${RC_SVCDIR}"
 
diff --git a/init.d/netmount.in b/init.d/netmount.in
index f136f45..3219c83 100644
--- a/init.d/netmount.in
+++ b/init.d/netmount.in
@@ -34,7 +34,7 @@ depend()
 	config /etc/fstab
 	need net ${pmap}
 	use afc-client amd autofs dns nfs nfsmount portmap rpcbind rpc.statd
-	keyword nojail noprefix
+	keyword nojail noopenvz noprefix novserver
 }
 
 start()
diff --git a/init.d/root.in b/init.d/root.in
index da21db5..c87b7f1 100644
--- a/init.d/root.in
+++ b/init.d/root.in
@@ -7,7 +7,7 @@ description="Mount the root fs read/write"
 depend()
 {
 	need fsck
-	keyword nojail noprefix
+	keyword nojail noopenvz noprefix novserver
 }
 
 start()
diff --git a/init.d/swap.in b/init.d/swap.in
index 0404af1..f64ddc5 100644
--- a/init.d/swap.in
+++ b/init.d/swap.in
@@ -5,7 +5,7 @@
 depend()
 {
 	need localmount
-	keyword nojail noprefix
+	keyword nojail noopenvz noprefix novserver
 }
 
 start()