File scripts-fixes.patch of Package vzctl

Overview Repositories Revisions Requests Users Attributes Meta

File scripts-fixes.patch of Package vzctl

diff --git a/Makefile.am b/Makefile.am
index 3b67cd8..dd47a2b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,7 +26,7 @@ noinst_HEADERS = $(wildcard include/*.h) \
 
 EXTRA_DIST = vzctl.spec
 
-vzdir       = /vz
+vzdir       = /srv/vz
 vzcachedir  = $(vzdir)/template/cache
 vzlockdir   = $(vzdir)/lock
 vzdumpdir   = $(vzdir)/dump
diff --git a/etc/Makefile.am b/etc/Makefile.am
index 6743fc8..4ecc924 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -40,6 +40,7 @@ install-redhat:
 
 install-suse:
 	$(MAKE) $(AM_MAKEFLAGS) -C init.d $@
+	$(MAKE) $(AM_MAKEFLAGS) -C network-scripts $@
 
 install-debian:
 	$(MAKE) $(AM_MAKEFLAGS) -C init.d $@
diff --git a/etc/init.d/vz-redhat.in b/etc/init.d/vz-redhat.in
index f311190..1bae35c 100755
--- a/etc/init.d/vz-redhat.in
+++ b/etc/init.d/vz-redhat.in
@@ -25,8 +25,8 @@
 
 ### BEGIN INIT INFO
 # Provides: vz
-# required-start: $network $remote_fs $local_fs sshd
-# required-stop:
+# Required-Start: $network $remote_fs $local_fs sshd
+# Required-Stop: $null
 # Default-Start: 2 3 4 5
 # Default-Stop: 0 1 6
 # Short-Description: OpenVZ startup script
diff --git a/etc/network-scripts/Makefile.am b/etc/network-scripts/Makefile.am
index 697fd37..3979bd3 100644
--- a/etc/network-scripts/Makefile.am
+++ b/etc/network-scripts/Makefile.am
@@ -38,3 +38,5 @@ install-redhat: $(NETSSCRIPTS)
 	for file in $(NETSDATA); do \
 		$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(netsdir)/$$file; \
 	done
+
+install-suse: install-redhat
diff --git a/etc/vz.conf b/etc/vz.conf
index 6315f34..60a55da 100644
--- a/etc/vz.conf
+++ b/etc/vz.conf
@@ -1,7 +1,7 @@
 ## Global parameters
 VIRTUOZZO=yes
-LOCKDIR=/vz/lock
-DUMPDIR=/vz/dump
+LOCKDIR=/srv/vz/lock
+DUMPDIR=/srv/vz/dump
 VE0CPUUNITS=1000
 
 ## Logging parameters
@@ -25,11 +25,11 @@ VZFASTBOOT=no
 NEIGHBOUR_DEVS=detect
 
 ## Template parameters
-TEMPLATE=/vz/template
+TEMPLATE=/srv/vz/template
 
 ## Defaults for containers
-VE_ROOT=/vz/root/$VEID
-VE_PRIVATE=/vz/private/$VEID
+VE_ROOT=/srv/vz/root/$VEID
+VE_PRIVATE=/srv/vz/private/$VEID
 CONFIGFILE="vps.basic"
 DEF_OSTEMPLATE="fedora-core-4"
 
diff --git a/paths.am b/paths.am
index 2f3ac33..221e00e 100644
--- a/paths.am
+++ b/paths.am
@@ -33,7 +33,7 @@ udevdir     = $(sysconfdir)/udev/rules.d
 endif
 
 initddir    = $(sysconfdir)/init.d
-netsdir     = $(sysconfdir)/sysconfig/network-scripts
+netsdir     = $(sysconfdir)/sysconfig/network
 
 pkgconfdir  = $(sysconfdir)/vz
 vpsconfdir  = $(pkgconfdir)/conf

Places

File scripts-fixes.patch of Package vzctl

Places