Merge branch 'master' of shin-project:lipck

Makefile

@@ -4,6 +4,9 @@ CONFIG_FILE=$(CURDIR)/config/Makefile.conf
 include $(CONFIG_FILE_DEFAULTS)
 include $(CONFIG_FILE)
 
+#read all offically config options from CONFIG_FILE_DEFAULTS
+CONFIGURABLE=$(shell cat "$(CONFIG_FILE_DEFAULTS)" | grep -v "^\#" | cut -s -d"=" -f1)
+
 ifndef ARCH
   ARCH=$(PRIMARY_ARCH)
 endif
@@ -106,12 +109,12 @@ $(call gentargets,$(STATE_DIR)/rootfs_prepared) : $(call archdir,%)$(STATE_DIR)/
 	test ! -e "$(call archdir,$*)$(ROOTFS)/remaster/"
 	if [ -e "$(call archdir,$*)$(ROOTFS)/etc/resolv.conf" ]; \
 	then \
-		cp "$(call archdir,$*)$(ROOTFS)/etc/resolv.conf" "$(call archdir,$*)$(ROOTFS)/etc/resolv.conf.bak"; \
+		cp -a --remove-destination "$(call archdir,$*)$(ROOTFS)/etc/resolv.conf" "$(call archdir,$*)$(ROOTFS)/etc/resolv.conf.bak"; \
 	fi
 	echo "#!/bin/bash" > "$(call archdir,$*)$(ROOTFS)/usr/sbin/init.lxc"
 	echo "shift; exec \$$@" >> "$(call archdir,$*)$(ROOTFS)/usr/sbin/init.lxc"
 	chmod +x "$(call archdir,$*)$(ROOTFS)/usr/sbin/init.lxc"
-	cp /etc/resolv.conf "$(call archdir,$*)$(ROOTFS)/etc/resolv.conf"
+	cp -a --remove-destination /etc/resolv.conf "$(call archdir,$*)$(ROOTFS)/etc/resolv.conf"
 	mkdir -p "$(call archdir,$*)$(ROOTFS)/remaster"
 	cp -Lr "$(CURDIR)"/config/copy_to_rootfs_remaster_dir/* "$(call archdir,$*)$(ROOTFS)/remaster"
 	echo "#!/bin/bash" > "$(call archdir,$*)$(ROOTFS)/remaster/remaster.gen.sh"
@@ -259,10 +262,8 @@ image : image_content
 
 config $(CONFIG_FILE):
 	@echo "Generating configuration $(CONFIG_FILE)"
-	echo -n "" > $(CONFIG_FILE)
-	echo "PRIMARY_ARCH=$(PRIMARY_ARCH)" >> "$(CONFIG_FILE)"
-	echo "SECONDARY_ARCH=$(SECONDARY_ARCH)" >> "$(CONFIG_FILE)"
-	echo "WORKSPACE=$(WORKSPACE)" >> "$(CONFIG_FILE)"
+	echo "#see $(CONFIG_FILE_DEFAULTS) for default values." > "$(CONFIG_FILE)"
+	echo -e -n "$(foreach option,$(CONFIGURABLE),$(option)=$($(option))\n)" | tr -d "[:blank:]" >> "$(CONFIG_FILE)"
 
 config_clean:
 	$(RM) $(CONFIG_FILE)
@@ -272,7 +273,7 @@ help:
 	@echo "Workspace: $(WORKSPACE)"
 	@echo "You may specify the Architecture by setting ARCH="
 	@echo
-	@echo "=== How to run make ==="
+	@echo "=== How to run lipck ==="
 	@echo "0. Run make config as user e.g. \"\$$ make WORKSPACE=/media/drivewithspace config\"."
 	@echo "1. Optional: Run \"make image_skel_file\" to obtain an empty image file."
 	@echo "   You may specify the target file with IMAGE_FILE="

scripts/remaster_rootfs.sh

@@ -58,15 +58,32 @@ function install_packages_from_file()
 	aptitude install -y $APT_OPTIONS $PKGS
 }
 
+function install_lang_packages()
+{
+	#the content of this function is extracted from UCK
+	MISSING_LANG_PKG="$(check-language-support -l de_DE)"
+        MISSING_LANG_PKG="$(check-language-support -l en_US) $MISSING_LANG_PKG" # check for missing packages for de_DE and en_US
+
+        if [ -n "$MISSING_LANG_PKG" ]; then
+                aptitude install $MISSING_LANG_PKG -y
+        fi
+
+        EXTRA_LANG_PKG="$(dpkg-query --show | cut -f1 | grep -E '^(language-pack|language-support|firefox-locale|thunderbird-locale|libreoffice-help|libreoffice-l10n)' | grep -Ev "[-](de|en)\>")" # remove extra language packages
+
+        if [ -n "$EXTRA_LANG_PKG" ]; then
+                aptitude purge $EXTRA_LANG_PKG -y
+        fi
+}
+
 function install_packages()
 {
 	apt-get dist-upgrade --assume-yes --force-yes
 	apt-get install aptitude -y
 
 	#aptitude full-upgrade -y # make sure we have the newest versions
-	# Some daily images do not have a kernel ?!?
 	
-	#uncomment this if you remaster a daily build (fix kernel version!)
+	#Some daily images do not have a kernel;
+	#ensure that a valid kernel is installed
 	KERNEL_PKG=linux-signed-generic-lts-trusty
 	[ "$(uname -m)" == "x86_64" ] || KERNEL_PKG=linux-image-generic-lts-trusty
 	aptitude reinstall $KERNEL_PKG -y
@@ -75,18 +92,7 @@ function install_packages()
 	install_packages_from_file "$CONTRIB_DIR/pre_installed_packages" ""
 	install_packages_from_file "$CONTRIB_DIR/pre_installed_packages.without-recommends" "--without-recommends"
 	
-	MISSING_LANG_PKG="$(check-language-support -l de_DE)"
-	MISSING_LANG_PKG="$(check-language-support -l en_US) $MISSING_LANG_PKG" # check for missing packages for de_DE and en_US
-	
-	if [ -n "$MISSING_LANG_PKG" ]; then
-		aptitude install $MISSING_LANG_PKG -y
-	fi
-	
-	EXTRA_LANG_PKG="$(dpkg-query --show | cut -f1 | grep -E '^(language-pack|language-support|firefox-locale|thunderbird-locale|libreoffice-help|libreoffice-l10n)' | grep -Ev "[-](de|en)\>")" # remove extra language packages
-
-	if [ -n "$EXTRA_LANG_PKG" ]; then
-		aptitude purge $EXTRA_LANG_PKG -y
-	fi
+	install_lang_packages
 
 	install_debs "$CONTRIB_DIR/debs/"
 }
@@ -96,7 +102,7 @@ function finalize()
 	echo -n "Europe/Berlin" > /etc/timezone
 	
 	rm -rf /var/crash/*
-	#TODO: verify
+
 	if [ -z "$LIPCK_HAS_APT_CACHE" ]
 	then
 	  rm -rf /var/cache/apt/*