X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vbuild-fedora-mirror.sh;h=716b9f3768dc719f0cec52eb6578b860fb957c48;hb=refs%2Fheads%2Fcoblitz;hp=ac53db7ba3a1477482314bb1b2b5ffed7e007f24;hpb=f39a4b5c8012682b2e102330e193ad8fc2782ba2;p=build.git

diff --git a/vbuild-fedora-mirror.sh b/vbuild-fedora-mirror.sh
index ac53db7b..716b9f37 100755
--- a/vbuild-fedora-mirror.sh
+++ b/vbuild-fedora-mirror.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 # this can help you create/update your fedora mirror
-# $Id$
 
 COMMAND=$(basename $0)
 LOGDIR=/var/log/fedora-mirroring
@@ -10,7 +9,7 @@ LOG=${LOGDIR}/${DATE}.log
 dry_run=
 verbose=
 log=
-skip_core=true
+skip_core=
 root=/mirror/
 
 
@@ -35,13 +34,13 @@ 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="centos5.5"
-all_distronames="f10 f12 centos5.3 centos5.4 centos5.5 epel5"
+default_distroname="centos5.6"
+all_distronames="f14 f16 centos5.6 epel5 epel6"
 default_arch="i386"
 all_archs="i386 x86_64"
 
 case $(hostname) in 
-    *.fr|*.de|*.uk)
+    blitz*|*.fr|*.de|*.uk)
 	fedora_url=$eu_fedora_url ; centos_url=$eu_centos_url ; epel_url=$eu_epel_url ;;
     *.pl)
 	fedora_url=$pl_fedora_url ; centos_url=$pl_centos_url ; epel_url=$pl_epel_url ;;
@@ -72,8 +71,8 @@ function mirror_distro_arch () {
 	    distro="CentOS"
 	    rsyncurl=$centos_url
 	    ;;
-	epel5)
-	    distroindex=5
+	epel[5-6])
+	    distroindex=$(echo $distroname | sed -e "s,epel,,g")
 	    distro=epel
 	    rsyncurl=$epel_url
 	    ;;
@@ -134,7 +133,7 @@ function mirror_distro_arch () {
 
 	epel*)
 	    case $distroindex in
-		5)
+		5|6)
 		    paths="$paths $distroindex/$arch/"
 		    RES=0
 		    ;;
@@ -180,8 +179,8 @@ function usage () {
     echo " -n : dry run"
     echo " -v : verbose"
     echo " -l : turns on autologging in $LOGDIR"
-    echo " -c : skips core repository (default)"
-    echo " -C : force syncing core repository"
+    echo " -c : skips core repository"
+    echo " -C : force syncing core repository (default)"
     echo " -r root (default is $root)"
     echo " -u rsyncurl for fedora (default is $fedora_url)"
     echo " -U rsyncurl for centos (default is $centos_url)"