--- ubiquity.orig/d-i/source/choose-mirror/Mirrors.masterlist.lliurex 1970-01-01 01:00:00.000000000 +0100 +++ ubiquity/d-i/source/choose-mirror/Mirrors.masterlist.lliurex 2014-12-05 13:13:05.035802923 +0100 @@ -0,0 +1,13 @@ +Site: lliurex.net +Type: Push-Primary +Archive-http: /xenial/ +Archive-architecture: i386 amd64 +Country: ES Spain +Location: Valencia + +Site: lliurex.upv.es +Type: Push-Primary +Archive-http: /xenial/ +Archive-architecture: i386 amd64 +Country: ES Spain +Location: Valencia --- ubiquity.orig/d-i/source/choose-mirror/Makefile 2014-02-12 16:07:29.000000000 +0100 +++ ubiquity/d-i/source/choose-mirror/Makefile 2014-12-05 13:12:39.471802713 +0100 @@ -34,7 +34,7 @@ # Derivative distributions may want to change these. #MIRRORLISTURL=http://anonscm.debian.org/viewvc/webwml/webwml/english/mirror/Mirrors.masterlist?revision=HEAD -MASTERLIST=Mirrors.masterlist.ubuntu +MASTERLIST=Mirrors.masterlist.lliurex ifdef DEBUG CFLAGS:=$(CFLAGS) -DDODEBUG --- ubiquity.orig/d-i/source/choose-mirror/debian/choose-mirror.postinst 2011-10-18 14:39:25.000000000 +0200 +++ ubiquity/d-i/source/choose-mirror/debian/choose-mirror.postinst 2014-12-05 13:12:14.747802509 +0100 @@ -3,14 +3,16 @@ anna-install apt-mirror-setup || true -if ! db_get mirror/suite || ! [ "$RET" ]; then - if [ -f /etc/lsb-release ]; then - . /etc/lsb-release - if [ -n "$DISTRIB_CODENAME" ]; then - db_set mirror/suite "$DISTRIB_CODENAME" - fi - fi -fi +#if ! db_get mirror/suite || ! [ "$RET" ]; then +# if [ -f /etc/lsb-release ]; then +# . /etc/lsb-release +# if [ -n "$DISTRIB_CODENAME" ]; then +# db_set mirror/suite "$DISTRIB_CODENAME" +# fi +# fi +#fi +db_set mirror/suite "xenial" +db_set mirror/codename "xenial" choose-mirror --- ubiquity.orig/d-i/source/choose-mirror/debian/choose-mirror-bin.templates.http-in 2014-01-29 15:37:22.000000000 +0100 +++ ubiquity/d-i/source/choose-mirror/debian/choose-mirror-bin.templates.http-in 2014-12-05 13:11:24.107802093 +0100 @@ -29,9 +29,7 @@ Template: mirror/http/mirror Type: select Choices: ${mirrors} -Default: CC.ports.ubuntu.com -Default[amd64]: CC.archive.ubuntu.com -Default[i386]: CC.archive.ubuntu.com +Default: lliurex.net # :sl1: _Description: Ubuntu archive mirror: Please select an Ubuntu archive mirror. You should use a mirror in @@ -52,9 +50,7 @@ Template: mirror/http/directory Type: string -Default: /ubuntu-ports/ -Default[amd64]: /ubuntu/ -Default[i386]: /ubuntu/ +Default: /xenial/ # :sl2: _Description: Ubuntu archive mirror directory: Please enter the directory in which the mirror of the Ubuntu archive is --- ubiquity.orig/d-i/source/choose-mirror/debian/choose-mirror-bin.templates.ftp.sel-in 2014-01-29 15:37:26.000000000 +0100 +++ ubiquity/d-i/source/choose-mirror/debian/choose-mirror-bin.templates.ftp.sel-in 2014-12-05 13:10:34.327801684 +0100 @@ -30,9 +30,7 @@ Template: mirror/ftp/mirror Type: select Choices: ${mirrors} -Default: CC.ports.ubuntu.com -Default[amd64]: CC.archive.ubuntu.com -Default[i386]: CC.archive.ubuntu.com +Default: lliurex.net # :sl2: _Description: Ubuntu archive mirror: Please select an Ubuntu archive mirror. You should use a mirror in --- ubiquity.orig/d-i/source/choose-mirror/debian/choose-mirror-bin.templates.ftp.base-in 2014-01-29 15:37:30.000000000 +0100 +++ ubiquity/d-i/source/choose-mirror/debian/choose-mirror-bin.templates.ftp.base-in 2014-12-05 13:10:10.039801484 +0100 @@ -12,9 +12,7 @@ Template: mirror/ftp/directory Type: string -Default: /ubuntu-ports/ -Default[amd64]: /ubuntu/ -Default[i386]: /ubuntu/ +Default: /xenial/ # :sl2: _Description: Ubuntu archive mirror directory: Please enter the directory in which the mirror of the Ubuntu archive is --- ubiquity.orig/d-i/source/choose-mirror/choose-mirror.c 2014-02-12 16:08:16.000000000 +0100 +++ ubiquity/d-i/source/choose-mirror/choose-mirror.c 2014-12-05 13:09:41.947801254 +0100 @@ -730,17 +730,17 @@ list = debconf_list(mirrors_in(country)); debconf_subst(debconf, mir, "mirrors", list); if ((debconf_get(debconf, mir) == 0 && - strcmp(debconf->value, "CC.archive.ubuntu.com") == 0) || + strcmp(debconf->value, "lliurex.net") == 0) || debconf_fget(debconf, mir, "seen") != 0 || strcmp(debconf->value, "true") != 0) { - countryarchive = get_localized_archive(".archive.ubuntu.com"); + countryarchive = get_localized_archive(".lliurex.net"); if (mirror_root(countryarchive)) debconf_set(debconf, mir, countryarchive); free(countryarchive); } if (debconf_get(debconf, mir) == 0 && - strcmp(debconf->value, "CC.ports.ubuntu.com") == 0) { - countryarchive = get_localized_archive(".ports.ubuntu.com"); + strcmp(debconf->value, "lliurex.net") == 0) { + countryarchive = get_localized_archive(".lliurex.net"); if (mirror_root(countryarchive)) debconf_set(debconf, mir, countryarchive); free(countryarchive);