[pve-devel] r6526 - in vzctl/trunk: . debian debian/patches

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-08-31 15:32:35 +0200 (Wed, 31 Aug 2011)
New Revision: 6526

Added:
   vzctl/trunk/debian/patches/fix-default-template.diff
Modified:
   vzctl/trunk/Makefile
   vzctl/trunk/debian/changelog
   vzctl/trunk/debian/patches/series
   vzctl/trunk/debian/rules
Log:
set defaull template to debian-6.0-standard


Modified: vzctl/trunk/Makefile
===================================================================
--- vzctl/trunk/Makefile	2011-08-31 12:35:52 UTC (rev 6525)
+++ vzctl/trunk/Makefile	2011-08-31 13:32:35 UTC (rev 6526)
@@ -1,7 +1,7 @@
 RELEASE=1.8
 
 SVER=3.0.28
-PACKAGERELEASE=1pve3
+PACKAGERELEASE=1pve4
 ARCH=amd64
 
 PACKAGE=vzctl

Modified: vzctl/trunk/debian/changelog
===================================================================
--- vzctl/trunk/debian/changelog	2011-08-31 12:35:52 UTC (rev 6525)
+++ vzctl/trunk/debian/changelog	2011-08-31 13:32:35 UTC (rev 6526)
@@ -1,5 +1,9 @@
-vzctl (3.0.28-1pve3) unstable; urgency=low
+vzctl (3.0.28-1pve4) unstable; urgency=low
 
+  * set defaull template to debian-6.0-standard
+  
+  * set CONFIGFILE="pve.auto" in /etc/vz/vz.conf
+
   * merge some fixes from upstream
 
  -- Proxmox Support Team <support at proxmox.com>  Wed, 31 Aug 2011 10:20:13 +0200

Added: vzctl/trunk/debian/patches/fix-default-template.diff
===================================================================
--- vzctl/trunk/debian/patches/fix-default-template.diff	                        (rev 0)
+++ vzctl/trunk/debian/patches/fix-default-template.diff	2011-08-31 13:32:35 UTC (rev 6526)
@@ -0,0 +1,15 @@
+Index: new/etc/vz.conf
+===================================================================
+--- new.orig/etc/vz.conf	2011-08-31 14:55:06.000000000 +0200
++++ new/etc/vz.conf	2011-08-31 14:58:29.000000000 +0200
+@@ -36,8 +36,8 @@
+ ## Defaults for containers
+ VE_ROOT=/vz/root/$VEID
+ VE_PRIVATE=/vz/private/$VEID
+-CONFIGFILE="basic"
+-DEF_OSTEMPLATE="centos-5"
++CONFIGFILE="pve.auto"
++DEF_OSTEMPLATE="debian-6.0-standard"
+ 
+ ## Load vzwdog module
+ VZWDOG="no"

Modified: vzctl/trunk/debian/patches/series
===================================================================
--- vzctl/trunk/debian/patches/series	2011-08-31 12:35:52 UTC (rev 6525)
+++ vzctl/trunk/debian/patches/series	2011-08-31 13:32:35 UTC (rev 6526)
@@ -1,3 +1,4 @@
 initlog.patch
 fix-init-script.patch
 fix-vzevent-init.patch
+fix-default-template.diff

Modified: vzctl/trunk/debian/rules
===================================================================
--- vzctl/trunk/debian/rules	2011-08-31 12:35:52 UTC (rev 6525)
+++ vzctl/trunk/debian/rules	2011-08-31 13:32:35 UTC (rev 6526)
@@ -62,7 +62,6 @@
 	# debianize vz.conf
 	sed -i \
 	    -e 's/\/vz\//\/var\/lib\/vz\//' \
-	    -e s/centos-5/debian-$(OS_DEB_VERSION)-$(DEB_BUILD_ARCH)-minimal/g \
 	    $(CURDIR)/debian/vzctl/etc/vz/vz.conf
 	
 	# set default dist-script to debian