[pve-devel] r4936 - vzctl/trunk/debian

[svn-commits at proxmox.com]

Author: dietmar
Date: 2010-08-06 06:24:47 +0000 (Fri, 06 Aug 2010)
New Revision: 4936

Modified:
   vzctl/trunk/debian/rules
   vzctl/trunk/debian/update_sysctl_conf
   vzctl/trunk/debian/vzctl.postinst
Log:


Modified: vzctl/trunk/debian/rules
===================================================================
--- vzctl/trunk/debian/rules	2010-08-05 12:32:31 UTC (rev 4935)
+++ vzctl/trunk/debian/rules	2010-08-06 06:24:47 UTC (rev 4936)
@@ -78,7 +78,7 @@
 	sed -i "s/'$(VZCTL_DEBVERSION)'/'$(VZCTL_VERSION)'/g" configure
 
 	# install sysctl file
-	install -m 644 $(CURDIR)/debian/sysctl $(CURDIR)/debian/vzctl/etc/sysctl.d/vzctl
+	install -m 644 $(CURDIR)/debian/sysctl $(CURDIR)/debian/vzctl/etc/sysctl.d/vzctl.conf
 
 	# lintian overrides
 	install -m 644 $(CURDIR)/debian/vzctl.override $(CURDIR)/debian/vzctl/usr/share/lintian/overrides/vzctl

Modified: vzctl/trunk/debian/update_sysctl_conf
===================================================================
--- vzctl/trunk/debian/update_sysctl_conf	2010-08-05 12:32:31 UTC (rev 4935)
+++ vzctl/trunk/debian/update_sysctl_conf	2010-08-06 06:24:47 UTC (rev 4936)
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 # remove OpenVZ specific settings from /etc/sysctl.conf
-# and move them to /etc/sysctl.d/vzctl
+# and move them to /etc/sysctl.d/vzctl.conf
 
 use strict;
 
@@ -39,9 +39,9 @@
 
 if ($found) {
     if ($vzctl_out) {
-	print "moving openvz sysctl settings to /etc/sysctl.d/vzctl\n";
-	open (OUT, ">/etc/sysctl.d/vzctl") || 
-	    die "cant't open '/etc/sysctl.d/vzctl' - $!";
+	print "moving openvz sysctl settings to /etc/sysctl.d/vzctl.conf\n";
+	open (OUT, ">/etc/sysctl.d/vzctl.conf") || 
+	    die "cant't open '/etc/sysctl.d/vzctl.conf' - $!";
 	my $res = print OUT $vzctl_out;
 	die "write failed" if !$res;
 	close OUT;

Modified: vzctl/trunk/debian/vzctl.postinst
===================================================================
--- vzctl/trunk/debian/vzctl.postinst	2010-08-05 12:32:31 UTC (rev 4935)
+++ vzctl/trunk/debian/vzctl.postinst	2010-08-06 06:24:47 UTC (rev 4936)
@@ -22,7 +22,7 @@
 	# make sure we correct sysctl settings
 	/usr/share/doc/vzctl/examples/update_sysctl_conf
 	if [ -f "/etc/sysctl.d/vzctl" ] ; then
-	    /sbin/sysctl -q -p /etc/sysctl.d/vzctl
+	    /sbin/sysctl -q -p /etc/sysctl.d/vzctl.conf
 	fi
 
 	if [ -x "/etc/init.d/vz" ]; then