From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 1 Dec 2010 22:10:17 +0000 (+0100)
Subject: add f14 as a supported distro
X-Git-Tag: 5.0-rc16~8
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=75b08c9098d82c50a3704167532bb128e58f71af;p=build.git

add f14 as a supported distro
---

diff --git a/pkgs.py b/pkgs.py
index b2a6be8f..941b49cd 100755
--- a/pkgs.py
+++ b/pkgs.py
@@ -1,8 +1,5 @@
 #!/usr/bin/python
 #
-# $Id$
-# $URL$
-# 
 # This is a replacement for the formerly bash-written function pl_parsePkgs () 
 # 
 # Usage: $0  [-a arch] default_arch keyword fcdistro pldistro pkgs-file[..s]
@@ -37,7 +34,7 @@ import re
 default_arch='x86_64'
 known_arch = ['i386','x86_64']
 default_fcdistro='f12'
-known_fcdistros = [ 'centos5','centos6','f8', 'f9','f10','f11','f12', 'f13' ]
+known_fcdistros = [ 'centos5','centos6','f8', 'f9','f10','f11','f12', 'f13', 'f14']
 default_pldistro='onelab'
 
 known_keywords=['groupname', 'groupdesc', 'kexclude', 'package', 'group', 'precious', 'junk', 'mirror', ]
diff --git a/vbuild-init-vserver.sh b/vbuild-init-vserver.sh
index 4f77d3a5..843ebe96 100755
--- a/vbuild-init-vserver.sh
+++ b/vbuild-init-vserver.sh
@@ -177,9 +177,9 @@ function setup_vserver () {
     echo persistent,lback_allow > /etc/vservers/$vserver/nflags
 
     # Set the init style of your vserver to plain for f13
-    if [ "$fcdistro" == "f13" ] ; then
-    	echo plain > /etc/vservers/$vserver/apps/init/style
-    fi
+    case $fcdistro in 
+	f13|f14) echo plain > /etc/vservers/$vserver/apps/init/style ;;
+    esac
 
     if [ "$pkg_method" = "yum" ] ; then
 	$personality vyum $vserver -- -y install yum