From 7083d80134251ab657be39e6af2576f50acc6c41 Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 18 Dec 2008 09:59:46 +0000
Subject: [PATCH] 4f10

---
 build.common                      | 3 ++-
 config.planetlab/bootcd.pkgs      | 4 ++--
 config.planetlab/bootstrapfs.pkgs | 4 +---
 mirroring/mirror.sh               | 2 +-
 vbuild-fedora-mirror.sh           | 6 +++---
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/build.common b/build.common
index 11ea761a..3b73da32 100644
--- a/build.common
+++ b/build.common
@@ -63,7 +63,7 @@ function pl_getReleaseName () {
 function pl_getKexcludes () {
     distroname=$1; shift
     case $distroname in 
-	f8|f9)
+	f?|f1?)
 	    echo 'kernel* util-vserver* iptables iproute'
 	    ;;
 	centos5)
@@ -71,6 +71,7 @@ function pl_getKexcludes () {
 	    ;;
 	*)
 	    echo "pl_DISTRO_NAME=$pl_DISTRO_NAME not supported in getexcludes.sh"
+	    exit 1
 	    ;;
     esac
 }
diff --git a/config.planetlab/bootcd.pkgs b/config.planetlab/bootcd.pkgs
index 8e5fb3b9..b670023f 100644
--- a/config.planetlab/bootcd.pkgs
+++ b/config.planetlab/bootcd.pkgs
@@ -74,5 +74,5 @@ precious: usr/share/terminfo/l/linux
 precious: usr/share/terminfo/v/vt100
 precious: usr/share/terminfo/x/xterm
 precious: usr/share/zoneinfo/UTC
-precious: usr/lib/locale/en_US.utf8
-precious-f9: usr/lib/locale/en_US.utf8
+precious+f8: usr/lib/locale/en_US.utf8
+precious+centos5: usr/lib/locale/en_US.utf8
diff --git a/config.planetlab/bootstrapfs.pkgs b/config.planetlab/bootstrapfs.pkgs
index ab0f656a..4cb3a8e8 100644
--- a/config.planetlab/bootstrapfs.pkgs
+++ b/config.planetlab/bootstrapfs.pkgs
@@ -4,6 +4,7 @@ groupname: PlanetLab
 groupdesc: PlanetLab Node Root
 # packages to exclude from stock repositories
 kexclude: @KEXCLUDE@
+# fedora-release or centos-release are pulled from deps
 # define packages
 package: kernel
 package: udev
@@ -26,9 +27,6 @@ package: libtermcap
 package: passwd
 package: procps
 package: readline
-# let's try without those, should be pulled from deps
-#package+f8 package+f9: fedora-release
-#package+centos5: centos-release
 package: rootfiles
 package: rpm
 package: setserial
diff --git a/mirroring/mirror.sh b/mirroring/mirror.sh
index 5fc0af97..8a598056 100755
--- a/mirroring/mirror.sh
+++ b/mirroring/mirror.sh
@@ -6,7 +6,7 @@ DIRNAME=$(dirname $0)
 
 default_url="http://localhost/mirror/"
 default_distro="f8"
-all_distros="f8 f9 f10 centos5"
+all_distros="f8 f10 centos5"
 
 function check_distro () {
     local distro=$1; shift
diff --git a/vbuild-fedora-mirror.sh b/vbuild-fedora-mirror.sh
index cf0b7cac..73e19325 100755
--- a/vbuild-fedora-mirror.sh
+++ b/vbuild-fedora-mirror.sh
@@ -28,9 +28,9 @@ jp_fedora_url="jp_fedora_url-needs-to-be-defined"
 jp_centos_url="jp_centos_url-needs-to-be-defined"
 jp_epel_url="jp_epel_url-needs-to-be-defined"
 
-default_distroname=f8
-all_distronames="f8 f9 f10 centos5.2 epel5"
-default_arch=i386
+default_distroname="centos5"
+all_distronames="f8 f10 centos5.2 epel5"
+default_arch="i386"
 all_archs="i386 x86_64"
 
 case $(hostname) in 
-- 
2.47.0