diff -Nuar ubiquity/scripts/apt-setup ubiquity.new/scripts/apt-setup
--- ubiquity/scripts/apt-setup	2009-05-11 13:48:24.000000000 +0200
+++ ubiquity.new/scripts/apt-setup	2009-05-21 18:23:12.000000000 +0200
@@ -1,14 +1,92 @@
 #! /bin/sh -e
 
-. /usr/share/debconf/confmodule
+SOURCES="/target/etc/apt/sources.list"
+COMPONENTS="main restricted universe multiverse"
+DISTRO="llx1009"
+DISTROUPDATES="$DISTRO-updates"
+DISTROSECURITY="$DISTRO-security"
+LOCALMIRROR="/net/mirror/active"
+MIRROR="mirror"
+HTTPPROT="http://"
+FILEPROT="file://"
+LLIUREXNET="lliurex.net/leia"
 
-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
-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
+write_desktop_sources(){
+
+cat <<EOF
+# LliureX 
+deb $HTTPPROT$LLIUREXNET $DISTRO $COMPONENTS
+#deb-src $HTTPPROT$LLIUREXNET $DISTRO $COMPONENTS
+
+# LliureX updates
+deb $HTTPPROT$LLIUREXNET $DISTROUPDATES $COMPONENTS
+#deb-src $HTTPPROT$LLIUREXNET $DISTROUPDATES $COMPONENTS
+
+# LLiureX security
+deb $HTTPPROT$LLIUREXNET $DISTROSECURITY $COMPONENTS
+#deb-src $HTTPPROT$LLIUREXNET $DISTROSECURITY $COMPONENTS
+
+EOF
+
+}
+
+write_localmirror_sources(){
+
+cat <<EOF
+# Mirror in local disk
+# LliureX 
+deb $FILEPROT$LOCALMIRROR $DISTRO $COMPONENTS
+#deb-src $FILEPROT$LOCALMIRROR $DISTRO $COMPONENTS
+
+# LliureX updates
+deb $FILEPROT$LOCALMIRROR $DISTROUPDATES $COMPONENTS
+#deb-src $FILEPROT$LOCALMIRROR $DISTROUPDATES $COMPONENTS
+
+# LLiureX security
+deb $FILEPROT$LOCALMIRROR $DISTROSECURITY $COMPONENTS
+#deb-src $FILEPROT$LOCALMIRROR $DISTROSECURITY $COMPONENTS
+
+EOF
+
+}
+
+write_server_sources(){
+
+write_desktop_sources
+write_localmirror_sources
+
+}
+
+write_client_sources(){
+
+cat <<EOF
+# Mirror in server disk
+# LliureX 
+deb $HTTPPROT$MIRROR $DISTRO $COMPONENTS
+#deb-src $HTTPPROT$MIRROR $DISTRO $COMPONENTS
+
+# LliureX updates
+deb $HTTPPROT$MIRROR $DISTROUPDATES $COMPONENTS
+#deb-src $HTTPPROT$MIRROR $DISTROUPDATES $COMPONENTS
+
+# LLiureX security
+deb $HTTPPROT$MIRROR $DISTROSECURITY $COMPONENTS
+#deb-src $HTTPPROT$MIRROR $DISTROSECURITY $COMPONENTS
+
+EOF
+
+}
+
+case "$(lliurex-version -v 2>/dev/null)" in
+	"*server")
+			write_server_sources > "$SOURCES"
+	;;
+	"*client")
+			write_client_sources > "$SOURCES"
+	;;
+	*)
+			write_desktop_sources > "$SOURCES"
+	;;
+esac
+
+exit 0