X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vbuild-fedora-mirror.sh;h=1980d0ad9d5642b02c84261a7b5ae7dbfd8dd3e0;hb=8c0beb6037ae0a1c845ca6226ae0a0247a9be46a;hp=14d9be794d8f9874b08165e64525ff073ebb8dbf;hpb=8d1e4e6f7e63a5f713187d6c6275b37581c69d34;p=build.git

diff --git a/vbuild-fedora-mirror.sh b/vbuild-fedora-mirror.sh
index 14d9be79..1980d0ad 100755
--- a/vbuild-fedora-mirror.sh
+++ b/vbuild-fedora-mirror.sh
@@ -30,12 +30,8 @@ pl_fedora_url=$eu_fedora_url
 pl_centos_url=rsync://ftp.tpnet.pl/centos
 pl_epel_url=rsync://ftp.icm.edu.pl/pub/Linux/fedora/linux/epel
 
-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="f13 f12 centos5.4 centos5.5 epel5"
+default_distroname="f16"
+all_distronames="f16 f18"
 default_arch="i386"
 all_archs="i386 x86_64"
 
@@ -71,8 +67,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
 	    ;;
@@ -133,7 +129,7 @@ function mirror_distro_arch () {
 
 	epel*)
 	    case $distroindex in
-		5)
+		5|6)
 		    paths="$paths $distroindex/$arch/"
 		    RES=0
 		    ;;
@@ -187,7 +183,6 @@ function usage () {
     echo " -E rsyncurl for epel (default is $epel_url)"
     echo " -s : uses standard (US) mirrors $us_fedora_url $us_centos_url $us_epel_url"
     echo " -e : uses European mirrors $eu_fedora_url $eu_centos_url $eu_epel_url"
-    echo " -j : uses Japanese mirrors $jp_fedora_url $jp_centos_url $jp_epel_url"
     echo " -f distroname - use vserver convention, e.g. f8 or centos5"
     echo " -F : for distroname in $all_distronames"
     echo " -a arch - use yum convention"
@@ -208,7 +203,7 @@ function run () {
 function main () {
     distronames=""
     archs=""
-    while getopts "nvlcCr:u:U:E:sejf:Fa:Ah" opt ; do
+    while getopts "nvlcCr:u:U:E:sef:Fa:Ah" opt ; do
 	case $opt in
 	    n) dry_run=--dry-run ;;
 	    v) verbose=--verbose ;;
@@ -221,7 +216,6 @@ function main () {
 	    E) epel_url=$OPTARG ;;
 	    s) fedora_url=$us_fedora_url ; centos_url=$us_centos_url ; epel_url=$us_epel_url;;
 	    e) fedora_url=$eu_fedora_url ; centos_url=$eu_centos_url ; epel_url=$eu_epel_url ;;
-	    j) fedora_url=$jp_fedora_url ; centos_url=$jp_centos_url ; epel_url=$jp_epel_url ;;
 	    f) distronames="$distronames $OPTARG" ;;
 	    F) distronames="$distronames $all_distronames" ;;
 	    a) archs="$archs $OPTARG" ;;