[Fusionforge-commits] r10917 - trunk/tests/openvz

Christian Bayle cbayle at libremir.placard.fr.eu.org
Fri Oct 8 20:44:37 CEST 2010


Author: cbayle
Date: 2010-10-08 20:44:37 +0200 (Fri, 08 Oct 2010)
New Revision: 10917

Added:
   trunk/tests/openvz/config.default
Modified:
   trunk/tests/openvz/Makefile
Log:
Export var out of makefile


Modified: trunk/tests/openvz/Makefile
===================================================================
--- trunk/tests/openvz/Makefile	2010-10-08 18:00:26 UTC (rev 10916)
+++ trunk/tests/openvz/Makefile	2010-10-08 18:44:37 UTC (rev 10917)
@@ -5,14 +5,10 @@
 RINSEPOSTINST=--after-post-install $(CURDIR)/local.rinse.api
 VEIDDEBTEMP=100
 VEIDCENTEMP=101
-VEIDDEB=105
-VEIDCEN=110
 ARCH=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 DIST=squeeze
 EXTRADEBPACKAGE=--include=ssh,less,htop,zsh
 EXTRACENTOSPACKAGE=openssh-server,man,zsh,bind-utils
-DEBVERS=6.0
-CENTVERS=5.5
 VZPRIVATEDIR=/var/lib/vz/private
 # You shouldn't change the next line, don't really work
 VZTEMPLATEDIR=/var/lib/vz/template
@@ -20,13 +16,12 @@
 DEBOOTSTRAP=/usr/sbin/debootstrap
 RINSE=extrapackage="$(EXTRACENTOSPACKAGE)" /usr/sbin/rinse
 
-IPDEBBASE=192.168.222
-IPDEBDNS=192.168.222.1
-
-IPCENTOSBASE=192.168.222
-IPCENTOSDNS=192.168.222.1
 # Default config
+include config.default
 
+# Optional local change
+-include config.$(shell hostname)
+
 # Local customization can be done using a local.<hostname> file
 # This is convenient if you use local mirror
 -include local.$(shell hostname)

Added: trunk/tests/openvz/config.default
===================================================================
--- trunk/tests/openvz/config.default	                        (rev 0)
+++ trunk/tests/openvz/config.default	2010-10-08 18:44:37 UTC (rev 10917)
@@ -0,0 +1,17 @@
+#
+# In this file you can find vars that are useable 
+# both as an include in a Makefile or
+# be sourced in a shell
+# So it should only be stuffs like VAR=value
+#
+VEIDDEB=105
+VEIDCEN=110
+
+DEBVERS=6.0
+CENTVERS=5.5
+
+IPDEBBASE=192.168.222
+IPDEBDNS=192.168.222.1
+
+IPCENTOSBASE=192.168.222
+IPCENTOSDNS=192.168.222.1




More information about the Fusionforge-commits mailing list