Author: zeising (doc,ports committer)
Date: Sat Sep 26 16:27:09 2020
New Revision: 366186
URL: https://svnweb.freebsd.org/changeset/base/366186

Log:
  bsdconfig, bsdinstall: Prune dead mirrors
  
  Prune dead mirrors from the list of mirrors in bsdconfig and bsdinstall.
  All these return NXDOMAIN when trying to resolve them.
  
  Reviewed by:  emaste
  Approved by:  emaste
  MFC after:    3 days
  Differential Revision:        https://reviews.freebsd.org/D26535

Modified:
  head/usr.sbin/bsdconfig/share/media/ftp.subr
  head/usr.sbin/bsdinstall/scripts/mirrorselect

Modified: head/usr.sbin/bsdconfig/share/media/ftp.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/media/ftp.subr        Sat Sep 26 14:44:58 
2020        (r366185)
+++ head/usr.sbin/bsdconfig/share/media/ftp.subr        Sat Sep 26 16:27:09 
2020        (r366186)
@@ -82,7 +82,6 @@ f_dialog_menu_media_ftp()
                ' IPv6 $msg_japan'        'ftp2.jp.freebsd.org'
                ' IPv6 $msg_sweden'       'ftp4.se.freebsd.org'
                ' IPv6 $msg_usa'          'ftp4.us.freebsd.org'
-               ' IPv6 $msg_turkey'       'ftp2.tr.freebsd.org'
                '$msg_primary'            'ftp1.freebsd.org'
                ' $msg_primary #2'        'ftp2.freebsd.org'
                ' $msg_primary #3'        'ftp3.freebsd.org'
@@ -95,7 +94,6 @@ f_dialog_menu_media_ftp()
                ' $msg_primary #12'       'ftp12.freebsd.org'
                ' $msg_primary #13'       'ftp13.freebsd.org'
                ' $msg_primary #14'       'ftp14.freebsd.org'
-               '$msg_armenia'            'ftp1.am.freebsd.org'
                '$msg_australia'          'ftp.au.freebsd.org'
                ' $msg_australia #2'      'ftp2.au.freebsd.org'
                ' $msg_australia #3'      'ftp3.au.freebsd.org'
@@ -103,11 +101,9 @@ f_dialog_menu_media_ftp()
                '$msg_brazil'             'ftp2.br.freebsd.org'
                ' $msg_brazil #3'         'ftp3.br.freebsd.org'
                ' $msg_brazil #4'         'ftp4.br.freebsd.org'
-               '$msg_canada'             'ftp.ca.freebsd.org'
                '$msg_china'              'ftp.cn.freebsd.org'
                '$msg_czech_republic'     'ftp.cz.freebsd.org'
                '$msg_denmark'            'ftp.dk.freebsd.org'
-               '$msg_estonia'            'ftp.ee.freebsd.org'
                '$msg_finland'            'ftp.fi.freebsd.org'
                '$msg_france'             'ftp.fr.freebsd.org'
                ' $msg_france #3'         'ftp3.fr.freebsd.org'
@@ -120,13 +116,11 @@ f_dialog_menu_media_ftp()
                ' $msg_germany #2'        'ftp2.de.freebsd.org'
                ' $msg_germany #4'        'ftp4.de.freebsd.org'
                ' $msg_germany #5'        'ftp5.de.freebsd.org'
-               ' $msg_germany #6'        'ftp6.de.freebsd.org'
                ' $msg_germany #7'        'ftp7.de.freebsd.org'
                ' $msg_germany #8'        'ftp8.de.freebsd.org'
                '$msg_greece'             'ftp.gr.freebsd.org'
                ' $msg_greece #2'         'ftp2.gr.freebsd.org'
                '$msg_ireland'            'ftp3.ie.freebsd.org'
-               '$msg_israel'             'ftp.il.freebsd.org'
                '$msg_japan'              'ftp.jp.freebsd.org'
                ' $msg_japan #2'          'ftp2.jp.freebsd.org'
                ' $msg_japan #3'          'ftp3.jp.freebsd.org'
@@ -139,16 +133,13 @@ f_dialog_menu_media_ftp()
                '$msg_korea'              'ftp.kr.freebsd.org'
                ' $msg_korea #2'          'ftp2.kr.freebsd.org'
                '$msg_latvia'             'ftp.lv.freebsd.org'
-               '$msg_lithuania'          'ftp.lt.freebsd.org'
                '$msg_netherlands'        'ftp.nl.freebsd.org'
                ' $msg_netherlands #2'    'ftp2.nl.freebsd.org'
                '$msg_new_zealand'        'ftp.nz.freebsd.org'
                '$msg_norway'             'ftp.no.freebsd.org'
                '$msg_poland'             'ftp.pl.freebsd.org'
-               ' $msg_poland #2'         'ftp2.pl.freebsd.org'
                '$msg_russia'             'ftp.ru.freebsd.org'
                ' $msg_russia #2'         'ftp2.ru.freebsd.org'
-               ' $msg_russia #4'         'ftp4.ru.freebsd.org'
                ' $msg_russia #5'         'ftp5.ru.freebsd.org'
                ' $msg_russia #6'         'ftp6.ru.freebsd.org'
                '$msg_slovak_republic'    'ftp.sk.freebsd.org'
@@ -157,13 +148,9 @@ f_dialog_menu_media_ftp()
                '$msg_south_africa'       'ftp.za.freebsd.org'
                ' $msg_south_africa #2'   'ftp2.za.freebsd.org'
                ' $msg_south_africa #4'   'ftp4.za.freebsd.org'
-               '$msg_spain'              'ftp.es.freebsd.org'
-               ' $msg_spain #3'          'ftp3.es.freebsd.org'
                '$msg_sweden'             'ftp.se.freebsd.org'
                ' $msg_sweden #2'         'ftp2.se.freebsd.org'
-               ' $msg_sweden #3'         'ftp3.se.freebsd.org'
                ' $msg_sweden #4'         'ftp4.se.freebsd.org'
-               ' $msg_sweden #6'         'ftp6.se.freebsd.org'
                '$msg_switzerland'        'ftp.ch.freebsd.org'
                '$msg_taiwan'             'ftp.tw.freebsd.org'
                ' $msg_taiwan #2'         'ftp2.tw.freebsd.org'

Modified: head/usr.sbin/bsdinstall/scripts/mirrorselect
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/mirrorselect       Sat Sep 26 14:44:58 
2020        (r366185)
+++ head/usr.sbin/bsdinstall/scripts/mirrorselect       Sat Sep 26 16:27:09 
2020        (r366186)
@@ -44,7 +44,6 @@ MIRROR=`dialog --backtitle "FreeBSD Installer" \
        ftp://ftp2.jp.freebsd.org       "IPv6 Japan"\
        ftp://ftp4.se.freebsd.org       "IPv6 Sweden"\
        ftp://ftp4.us.freebsd.org       "IPv6 USA"\
-       ftp://ftp2.tr.freebsd.org       "IPv6 Turkey"\
        ftp://ftp1.freebsd.org  "Primary"\
        ftp://ftp2.freebsd.org  "Primary #2"\
        ftp://ftp3.freebsd.org  "Primary #3"\
@@ -57,7 +56,6 @@ MIRROR=`dialog --backtitle "FreeBSD Installer" \
        ftp://ftp12.freebsd.org         "Primary #12"\
        ftp://ftp13.freebsd.org         "Primary #13"\
        ftp://ftp14.freebsd.org         "Primary #14"\
-       ftp://ftp1.am.freebsd.org       "Armenia"\
        ftp://ftp.au.freebsd.org        "Australia"\
        ftp://ftp2.au.freebsd.org       "Australia #2"\
        ftp://ftp3.au.freebsd.org       "Australia #3"\
@@ -65,11 +63,9 @@ MIRROR=`dialog --backtitle "FreeBSD Installer" \
        ftp://ftp2.br.freebsd.org       "Brazil #2"\
        ftp://ftp3.br.freebsd.org       "Brazil #3"\
        ftp://ftp4.br.freebsd.org       "Brazil #4"\
-       ftp://ftp.ca.freebsd.org        "Canada"\
        ftp://ftp.cn.freebsd.org        "China"\
        ftp://ftp.cz.freebsd.org        "Czech Republic"\
        ftp://ftp.dk.freebsd.org        "Denmark"\
-       ftp://ftp.ee.freebsd.org        "Estonia"\
        ftp://ftp.fi.freebsd.org        "Finland"\
        ftp://ftp.fr.freebsd.org        "France"\
        ftp://ftp3.fr.freebsd.org       "France #3"\
@@ -82,13 +78,11 @@ MIRROR=`dialog --backtitle "FreeBSD Installer" \
        ftp://ftp2.de.freebsd.org       "Germany #2"\
        ftp://ftp4.de.freebsd.org       "Germany #4"\
        ftp://ftp5.de.freebsd.org       "Germany #5"\
-       ftp://ftp6.de.freebsd.org       "Germany #6"\
        ftp://ftp7.de.freebsd.org       "Germany #7"\
        ftp://ftp8.de.freebsd.org       "Germany #8"\
        ftp://ftp.gr.freebsd.org        "Greece"\
        ftp://ftp2.gr.freebsd.org       "Greece #2"\
        ftp://ftp3.ie.freebsd.org       "Ireland #3"\
-       ftp://ftp.il.freebsd.org        "Israel"\
        ftp://ftp.jp.freebsd.org        "Japan"\
        ftp://ftp2.jp.freebsd.org       "Japan #2"\
        ftp://ftp3.jp.freebsd.org       "Japan #3"\
@@ -101,16 +95,13 @@ MIRROR=`dialog --backtitle "FreeBSD Installer" \
        ftp://ftp.kr.freebsd.org        "Korea"\
        ftp://ftp2.kr.freebsd.org       "Korea #2"\
        ftp://ftp.lv.freebsd.org        "Latvia"\
-       ftp://ftp.lt.freebsd.org        "Lithuania"\
        ftp://ftp.nl.freebsd.org        "Netherlands"\
        ftp://ftp2.nl.freebsd.org       "Netherlands #2"\
        ftp://ftp.nz.freebsd.org        "New Zealand"\
        ftp://ftp.no.freebsd.org        "Norway"\
        ftp://ftp.pl.freebsd.org        "Poland"\
-       ftp://ftp2.pl.freebsd.org       "Poland #2"\
        ftp://ftp.ru.freebsd.org        "Russia"\
        ftp://ftp2.ru.freebsd.org       "Russia #2"\
-       ftp://ftp4.ru.freebsd.org       "Russia #4"\
        ftp://ftp5.ru.freebsd.org       "Russia #5"\
        ftp://ftp6.ru.freebsd.org       "Russia #6"\
        ftp://ftp.sk.freebsd.org        "Slovak Republic"\
@@ -119,13 +110,8 @@ MIRROR=`dialog --backtitle "FreeBSD Installer" \
        ftp://ftp.za.freebsd.org        "South Africa"\
        ftp://ftp2.za.freebsd.org       "South Africa #2"\
        ftp://ftp4.za.freebsd.org       "South Africa #4"\
-       ftp://ftp.es.freebsd.org        "Spain"\
-       ftp://ftp3.es.freebsd.org       "Spain #3"\
        ftp://ftp.se.freebsd.org        "Sweden"\
-       ftp://ftp2.se.freebsd.org       "Sweden #2"\
-       ftp://ftp3.se.freebsd.org       "Sweden #3"\
        ftp://ftp4.se.freebsd.org       "Sweden #4"\
-       ftp://ftp6.se.freebsd.org       "Sweden #6"\
        ftp://ftp.ch.freebsd.org        "Switzerland"\
        ftp://ftp.tw.freebsd.org        "Taiwan"\
        ftp://ftp2.tw.freebsd.org       "Taiwan #2"\
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to