source: ubiquity/trunk/fuentes/debian/patches/choose-mirror.patch

Last change on this file was 1480, checked in by daduve, 5 years ago

upgrading patch

File size: 4.8 KB
  • d-i/source/choose-mirror/Mirrors.masterlist.lliurex

    old new  
     1Site: lliurex.net
     2Type: Push-Primary
     3Archive-http: /xenial/
     4Archive-architecture: i386 amd64
     5Country: ES Spain
     6Location: Valencia
     7
     8Site: lliurex.upv.es
     9Type: Push-Primary
     10Archive-http: /xenial/
     11Archive-architecture: i386 amd64
     12Country: ES Spain
     13Location: Valencia
  • d-i/source/choose-mirror/Makefile

    old new  
    3434
    3535# Derivative distributions may want to change these.
    3636#MIRRORLISTURL=http://anonscm.debian.org/viewvc/webwml/webwml/english/mirror/Mirrors.masterlist?revision=HEAD
    37 MASTERLIST=Mirrors.masterlist.ubuntu
     37MASTERLIST=Mirrors.masterlist.lliurex
    3838
    3939ifdef DEBUG
    4040CFLAGS:=$(CFLAGS) -DDODEBUG
  • d-i/source/choose-mirror/debian/choose-mirror.postinst

    old new  
    33
    44anna-install apt-mirror-setup || true
    55
    6 if ! db_get mirror/suite || ! [ "$RET" ]; then
    7         if [ -f /etc/lsb-release ]; then
    8                 . /etc/lsb-release
    9                 if [ -n "$DISTRIB_CODENAME" ]; then
    10                         db_set mirror/suite "$DISTRIB_CODENAME"
    11                 fi
    12         fi
    13 fi
     6#if ! db_get mirror/suite || ! [ "$RET" ]; then
     7#       if [ -f /etc/lsb-release ]; then
     8#               . /etc/lsb-release
     9#               if [ -n "$DISTRIB_CODENAME" ]; then
     10#                       db_set mirror/suite "$DISTRIB_CODENAME"
     11#               fi
     12#       fi
     13#fi
     14db_set mirror/suite "xenial"
     15db_set mirror/codename "xenial"
    1416
    1517choose-mirror
    1618
  • d-i/source/choose-mirror/debian/choose-mirror-bin.templates.http-in

    old new  
    2929Template: mirror/http/mirror
    3030Type: select
    3131Choices: ${mirrors}
    32 Default: CC.ports.ubuntu.com
    33 Default[amd64]: CC.archive.ubuntu.com
    34 Default[i386]: CC.archive.ubuntu.com
     32Default: lliurex.net
    3533# :sl1:
    3634_Description: Ubuntu archive mirror:
    3735 Please select an Ubuntu archive mirror. You should use a mirror in
     
    5250
    5351Template: mirror/http/directory
    5452Type: string
    55 Default: /ubuntu-ports/
    56 Default[amd64]: /ubuntu/
    57 Default[i386]: /ubuntu/
     53Default: /xenial/
    5854# :sl2:
    5955_Description: Ubuntu archive mirror directory:
    6056 Please enter the directory in which the mirror of the Ubuntu archive is
  • d-i/source/choose-mirror/debian/choose-mirror-bin.templates.ftp.sel-in

    old new  
    3030Template: mirror/ftp/mirror
    3131Type: select
    3232Choices: ${mirrors}
    33 Default: CC.ports.ubuntu.com
    34 Default[amd64]: CC.archive.ubuntu.com
    35 Default[i386]: CC.archive.ubuntu.com
     33Default: lliurex.net
    3634# :sl2:
    3735_Description: Ubuntu archive mirror:
    3836 Please select an Ubuntu archive mirror. You should use a mirror in
  • d-i/source/choose-mirror/debian/choose-mirror-bin.templates.ftp.base-in

    old new  
    1212
    1313Template: mirror/ftp/directory
    1414Type: string
    15 Default: /ubuntu-ports/
    16 Default[amd64]: /ubuntu/
    17 Default[i386]: /ubuntu/
     15Default: /xenial/
    1816# :sl2:
    1917_Description: Ubuntu archive mirror directory:
    2018 Please enter the directory in which the mirror of the Ubuntu archive is
  • d-i/source/choose-mirror/choose-mirror.c

    old new  
    730730                list = debconf_list(mirrors_in(country));
    731731                debconf_subst(debconf, mir, "mirrors", list);
    732732                if ((debconf_get(debconf, mir) == 0 &&
    733                      strcmp(debconf->value, "CC.archive.ubuntu.com") == 0) ||
     733                     strcmp(debconf->value, "lliurex.net") == 0) ||
    734734                    debconf_fget(debconf, mir, "seen") != 0 ||
    735735                    strcmp(debconf->value, "true") != 0) {
    736                         countryarchive = get_localized_archive(".archive.ubuntu.com");
     736                        countryarchive = get_localized_archive(".lliurex.net");
    737737                        if (mirror_root(countryarchive))
    738738                                debconf_set(debconf, mir, countryarchive);
    739739                        free(countryarchive);
    740740                }
    741741                if (debconf_get(debconf, mir) == 0 &&
    742                     strcmp(debconf->value, "CC.ports.ubuntu.com") == 0) {
    743                         countryarchive = get_localized_archive(".ports.ubuntu.com");
     742                    strcmp(debconf->value, "lliurex.net") == 0) {
     743                        countryarchive = get_localized_archive(".lliurex.net");
    744744                        if (mirror_root(countryarchive))
    745745                                debconf_set(debconf, mir, countryarchive);
    746746                        free(countryarchive);
Note: See TracBrowser for help on using the repository browser.