rootfs_remaster: generate apt/sources.list

Since lipck knows the release it can do it and nobody will miss
to edit the static sources.list again (in particular, this sucks
when trying out new releases)

Makefile

@@ -178,6 +178,15 @@ $(call gentargets,$(STATE_DIR)/rootfs_prepared) : $(call archdir,%)$(STATE_DIR)/
 rootfs_remaster : $(ARCH_DIR)$(STATE_DIR)/rootfs_remastered
 $(call gentargets,$(STATE_DIR)/rootfs_remastered) : $(call archdir,%)$(STATE_DIR)/rootfs_extracted | $(APT_CACHE_DIR)
 	$(MAKE) ARCH=$* rootfs_prepare
+ifneq($(strip $(APT_SOURCE_URL_OVERRIDE)),)
+	#override apt sources list
+	echo "deb $(APT_SOURCE_URL_OVERRIDE) $(ISO_RELEASE) main restricted universe multiverse" \
+		> "$(call archdir,$*)$(ROOTFS)/etc/apt/sources.list"
+        echo "deb $(APT_SOURCE_URL_OVERRIDE) $(ISO_RELEASE)-security main restricted universe multiverse" \
+                >> "$(call archdir,$*)$(ROOTFS)/etc/apt/sources.list"
+        echo "deb $(APT_SOURCE_URL_OVERRIDE) $(ISO_RELEASE)-updates main restricted universe multiverse" \
+                >> "$(call archdir,$*)$(ROOTFS)/etc/apt/sources.list"
+endif
 	mkdir -p "$(call archdir,$*)$(LXC_DIR)"
 	lxc-execute --name "lipck_remaster_$*" -P "$(call archdir,$*)$(LXC_DIR)" -f "$(CURDIR)/config/lxc_common.conf" \
 	-s lxc.arch="$*" -s lxc.rootfs="$(call archdir,$*)$(ROOTFS)" \

config/Makefile.conf.defaults

@@ -27,6 +27,8 @@ ISO_VERSION=14.04.2
 ISO_FLAVOR=kubuntu
 ISO_PATTERN_FLAGS=
 
+APT_SOURCE_URL_OVERRIDE=http://ftp.halifax.rwth-aachen.de/ubuntu/
+
 IMAGE_DIR=$(WORKSPACE)/image_files/
 IMAGE_GIT_URL=https://www.fsmpi.rwth-aachen.de/git/lipstick
 IMAGE_GIT_BRANCH=ss15

contrib/rootfs/lip_sources.list

-deb http://ftp.halifax.rwth-aachen.de/ubuntu/ trusty main restricted universe multiverse
-deb http://security.ubuntu.com/ubuntu/ trusty-security main restricted universe multiverse
-deb http://ftp.halifax.rwth-aachen.de/ubuntu/ trusty-updates main restricted universe multiverse
-
-#deb http://de.archive.ubuntu.com/ubuntu/ trusty main restricted universe multiverse
-#deb http://de.archive.ubuntu.com/ubuntu/ trusty-updates main restricted universe multiverse

scripts/rootfs_remaster.sh

@@ -42,10 +42,6 @@ fi
 
 function prepare_install()
 {
-	if [ -e "$CONTRIB_DIR/lip_sources.list" ]; then
-		cp -v "$CONTRIB_DIR/lip_sources.list" "/etc/apt/sources.list"
-	fi
-	
 	#uncomment if newest texlive is not part of your distribution
 	#add-apt-repository -y ppa:texlive-backports/ppa