diff -Nuar ubiquity.orig/d-i/source/choose-mirror/ ubiquity/d-i/source/choose-mirror/ --- ubiquity.orig/d-i/source/choose-mirror/Mirrors.masterlist.lliurex 2009-04-22 16:37:04.000000000 +0200 +++ ubiquity/d-i/source/choose-mirror/Mirrors.masterlist.lliurex 2009-04-22 16:36:53.000000000 +0200 @@ -0,0 +1,28 @@ +Site: lliurex.net +Type: Push-Primary +Archive-http: /leia/ +Archive-architecture: i386 +Country: ES Spain +Location: Valencia + +Site: lliurex.upv.es +Type: Push-Primary +Archive-http: /leia/ +Archive-architecture: i386 +Country: ES Spain +Location: Valencia + +Site: ftp.ua.es +Type: Push-Primary +Archive-http: /pub/linux/lliurex/leia/ +Archive-ftp: /pub/linux/lliurex/leia/ +Archive-architecture: i386 +Country: ES Spain +Location: Alicante + +Site: lliurex.uji.es +Type: Push-Primary +Archive-http: /lliurex/leia/ +Archive-architecture: i386 +Country: ES Spain +Location: Castellón --- ubiquity.orig/d-i/source/choose-mirror/choose-mirror.c 2009-04-22 16:09:47.000000000 +0200 +++ ubiquity/d-i/source/choose-mirror/choose-mirror.c 2009-04-22 16:11:38.000000000 +0200 @@ -362,10 +362,10 @@ char *mir = add_protocol("mirror"); countryarchive=malloc(strlen(country) + - strlen(".archive.ubuntu.com") + 1); + strlen(".lliurex.net") + 1); for (i = 0; country[i]; ++i) countryarchive[i] = tolower((unsigned char) country[i]); - strcpy(countryarchive + i, ".archive.ubuntu.com"); + strcpy(countryarchive + i, ".lliurex.net"); /* Prompt for mirror in selected country. */ list=debconf_list(mirrors_in(country)); --- ubiquity.orig/d-i/source/choose-mirror/Makefile 2009-04-22 16:08:08.000000000 +0200 +++ ubiquity/d-i/source/choose-mirror/Makefile 2009-04-22 16:08:40.000000000 +0200 @@ -28,7 +28,7 @@ # Derivative distributions may want to change these. #MIRRORLISTURL=http://cvs.debian.org/*checkout*/webwml/english/mirror/Mirrors.masterlist?rev=HEAD&cvsroot=webwml&content-type=text/plain -MASTERLIST=Mirrors.masterlist.ubuntu +MASTERLIST=Mirrors.masterlist.lliurex ifdef DEBUG CFLAGS:=$(CFLAGS) -DDODEBUG --- ubiquity.orig/d-i/source/choose-mirror/debian/choose-mirror-bin.templates.ftp.base-in 2009-04-22 16:29:42.000000000 +0200 +++ ubiquity/d-i/source/choose-mirror/debian/choose-mirror-bin.templates.ftp.base-in 2009-04-22 16:24:53.000000000 +0200 @@ -11,12 +11,7 @@ Template: mirror/ftp/directory Type: string -Default: /ubuntu/ -Default[armel]: /ubuntu-ports/ -Default[ia64]: /ubuntu-ports/ -Default[lpia]: /ubuntu-ports/ -Default[powerpc]: /ubuntu-ports/ -Default[sparc]: /ubuntu-ports/ +Default: /leia/ # :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.http-in 2009-04-22 16:29:42.000000000 +0200 +++ ubiquity/d-i/source/choose-mirror/debian/choose-mirror-bin.templates.http-in 2009-04-22 16:24:36.000000000 +0200 @@ -29,12 +29,7 @@ Template: mirror/http/mirror Type: select Choices: ${mirrors} -Default: CC.archive.ubuntu.com -Default[armel]: ports.ubuntu.com -Default[ia64]: ports.ubuntu.com -Default[lpia]: ports.ubuntu.com -Default[powerpc]: ports.ubuntu.com -Default[sparc]: ports.ubuntu.com +Default: lliurex.net # :sl1: _Description: Ubuntu archive mirror: Please select an Ubuntu archive mirror. You should use a mirror in @@ -54,12 +49,7 @@ Template: mirror/http/directory Type: string -Default: /ubuntu/ -Default[armel]: /ubuntu-ports/ -Default[ia64]: /ubuntu-ports/ -Default[lpia]: /ubuntu-ports/ -Default[powerpc]: /ubuntu-ports/ -Default[sparc]: /ubuntu-ports/ +Default: /leia/ # :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.postinst 2009-04-22 16:29:42.000000000 +0200 +++ ubiquity/d-i/source/choose-mirror/debian/choose-mirror.postinst 2009-04-22 16:27:29.000000000 +0200 @@ -3,12 +3,15 @@ anna-install apt-mirror-setup || true -if [ -f /etc/lsb-release ]; then - . /etc/lsb-release - if [ -n "$DISTRIB_CODENAME" ]; then - db_set mirror/suite "$DISTRIB_CODENAME" - fi -fi +#if [ -f /etc/lsb-release ]; then +# . /etc/lsb-release +# if [ -n "$DISTRIB_CODENAME" ]; then +# db_set mirror/suite "$DISTRIB_CODENAME" +# fi +#fi + +db_set mirror/suite "llx1009" +db_set mirror/codename "llx1009" choose-mirror --- ubiquity.orig/d-i/source/choose-mirror/debian/choose-mirror-bin.templates.ftp.sel-in 2009-04-22 16:29:42.000000000 +0200 +++ ubiquity/d-i/source/choose-mirror/debian/choose-mirror-bin.templates.ftp.sel-in 2009-04-22 16:23:22.000000000 +0200 @@ -30,12 +30,7 @@ Template: mirror/ftp/mirror Type: select Choices: ${mirrors} -Default: CC.archive.ubuntu.com -Default[armel]: ports.ubuntu.com -Default[ia64]: ports.ubuntu.com -Default[lpia]: ports.ubuntu.com -Default[powerpc]: ports.ubuntu.com -Default[sparc]: ports.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-in 2009-04-22 16:28:29.000000000 +0200 +++ ubiquity/d-i/source/choose-mirror/debian/choose-mirror-bin.templates-in 2009-04-22 16:28:29.000000000 +0200 @@ -10,8 +10,8 @@ Template: mirror/suite Type: select -Choices: dapper, hardy, intrepid, jaunty, karmic, lucid -Default: lucid +Choices: dapper, hardy, intrepid, jaunty, karmic, lucid, llx0711, llx0809, lx0909, llx1009 +Default: llx1009 Description: Ubuntu version to install: In Ubuntu, this question is never asked, and is only for preseeding. Caveat emptor.