more changes for f22

diff --git a/lbuild-initvm.sh b/lbuild-initvm.sh
index 1475cad..6cb1123 100755 (executable)
--- a/lbuild-initvm.sh
+++ b/lbuild-initvm.sh
@@ -30,10 +30,10 @@ function lxcroot () {
 
 # XXX fixme : when creating a 32bits VM we need to call linux32 as appropriate...s
 
-DEFAULT_FCDISTRO=f21
+DEFAULT_FCDISTRO=f22
 DEFAULT_PLDISTRO=lxc
 DEFAULT_PERSONALITY=linux64
-DEFAULT_MEMORY=2048
+DEFAULT_MEMORY=3072
 
 ##########
 # constant

diff --git a/lxc.mk b/lxc.mk
index 10921cf..04d9b0a 100644 (file)
--- a/lxc.mk
+++ b/lxc.mk
@@ -30,9 +30,8 @@ IN_NODEIMAGE += transforward
 #
 # procprotect: root context module for protecting against weaknesses in /proc
 #
-### remove procprotect from the nodes on f21 now that it has 3.19
-### as of beg apr 15 f20 also runs 3.19
-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f20 f21)"
+### remove procprotect from the nodes on f20 and above, needs more work starting with 3.19
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f20 f21 f22)"
 procprotect-MODULES := procprotect
 procprotect-SPEC := procprotect.spec
 ALL += procprotect
@@ -126,8 +125,8 @@ IN_NODEIMAGE += codemux
 #
 # fprobe-ulog
 #
-# xxx temporarily turning this off on f20 and f21
-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f20 f21)"
+# xxx temporarily turning this off on f20 and above
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f20 f21 f22)"
 fprobe-ulog-MODULES := fprobe-ulog
 fprobe-ulog-SPEC := fprobe-ulog.spec
 ALL += fprobe-ulog
@@ -257,7 +256,7 @@ IN_NODEIMAGE += vsys-scripts
 ALL += vsys-scripts
 
 # xxx temporarily turning this off on f21
-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f21)"
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f21 f22)"
 vsys-wrapper-MODULES := vsys-scripts
 vsys-wrapper-SPEC := slice-context/vsys-wrapper.spec
 IN_SLICEIMAGE += vsys-wrapper

diff --git a/pkgs.py b/pkgs.py
index a2f36aa..23c00c7 100755 (executable)
--- a/pkgs.py
+++ b/pkgs.py
@@ -35,7 +35,7 @@ default_arch='x86_64'
 known_arch = ['i386', 'i686', 'x86_64']
 default_fcdistro='f14'
 known_fcdistros = [ 'centos5','centos6',
-                    'f8', 'f10','f12', 'f14', 'f16', 'f18','f20','f21',
+                    'f8', 'f10', 'f12', 'f14', 'f16', 'f18', 'f20', 'f21', 'f22',
                     'sl6', 
                     # debians
                     'squeeze','wheezy','jessie',