diff -Nuar ubiquity.orig/scripts/apt-setup ubiquity/scripts/apt-setup --- ubiquity.orig/scripts/apt-setup 2013-02-19 09:42:07.124890898 +0100 +++ ubiquity/scripts/apt-setup 2013-02-19 11:28:32.708555319 +0100 @@ -1,15 +1,54 @@ #! /bin/sh -e +SOURCES="/target/etc/apt/sources.list" +COMPONENTS="main restricted universe multiverse partner" +DISTRO="trusty" +MIRROR="mirror" +HTTPPROT="http://" +LLIUREXNET="lliurex.net/trusty" +write_desktop_sources(){ -. /usr/share/debconf/confmodule +cat </dev/null)" in + "*server"|"*client") + write_server_sources > "$SOURCES" + write_desktop_sources_commented >> "$SOURCES" + ;; + *) + write_desktop_sources > "$SOURCES" + ;; +esac + +exit 0 -if CODENAME="$(lsb_release -cs)"; then - # TODO cjwatson 2006-04-07: wrong for Debian, I think - db_set mirror/suite "$CODENAME" - db_set mirror/codename "$CODENAME" -fi - -rm -f /target/etc/apt/sources.list -rm -f /target/etc/apt/sources.list.d/dvd.list -PATH="/usr/lib/ubiquity/apt-setup:/usr/lib/ubiquity/choose-mirror:$PATH" \ - OVERRIDE_BASE_INSTALLABLE=1 OVERRIDE_LEAVE_CD_MOUNTED=1 \ - /usr/lib/ubiquity/apt-setup/apt-setup --log-output /target