From 97f8cd14a1a1a4033b04b5816d584a5cc57324e2 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Tue, 14 Jan 2014 16:54:48 +0100
Subject: [rootfs-stage31] fix wrong permissions of files extracted from the
 config.tgz

---
 remote/rootfs/rootfs-stage31/data/bin/activate_sysconfig | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/remote/rootfs/rootfs-stage31/data/bin/activate_sysconfig b/remote/rootfs/rootfs-stage31/data/bin/activate_sysconfig
index bc7dfd71..3f8029a7 100755
--- a/remote/rootfs/rootfs-stage31/data/bin/activate_sysconfig
+++ b/remote/rootfs/rootfs-stage31/data/bin/activate_sysconfig
@@ -61,8 +61,12 @@ HEREEND
                 hwclock -s -u
         fi
 
-
-	tar xf "${CONFIG}.tgz" -C "${FUTURE_ROOT}" || { echo "Could not untar ${CONFIG}.tgz to ${FUTURE_ROOT}"; return 1; }
+	local TEMP_EXTRACT_DIR="/tmp/config.tgz.tmp"	
+	mkdir -p "${TEMP_EXTRACT_DIR}"
+	tar xf "${CONFIG}.tgz" -C "${TEMP_EXTRACT_DIR}" || { echo "Could not untar ${CONFIG}.tgz to ${TEMP_EXTRACT_DIR}"; return 1; }
+	chown -R 0:0 "${TEMP_EXTRACT_DIR}"
+	cd "${TEMP_EXTRACT_DIR}"
+	tar -cp * | tar -xp -C "${FUTURE_ROOT}"
 }
 
 
-- 
cgit v1.2.3-55-g7522


From f3b6eb11d6bc121a21b66b3c5d46377c5b4eaffa Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Tue, 14 Jan 2014 17:07:12 +0100
Subject: [packing.inc] change initramfs compression method to xz/lzma

---
 server/includes/packing.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/includes/packing.inc b/server/includes/packing.inc
index 01bdff99..85d28de4 100644
--- a/server/includes/packing.inc
+++ b/server/includes/packing.inc
@@ -11,7 +11,7 @@ generate_initramfs() {
 	cd "$1" || perror "Cannot cd to '$1'"
 	rm -f -- "$3"
 
-	find $2 | cpio --format="newc" --create | gzip -9 > "$3"
+	find $2 | cpio --format="newc" --create | xz --check=crc32 --lzma2=dict=1MiB > "$3"
 	local PS=(${PIPESTATUS[*]})
 	[ "x${PS[0]}" != "x0" ] && perror "'find $2' in '$(pwd)' failed."
 	[ "x${PS[1]}" != "x0" ] && perror "cpio create failed."
-- 
cgit v1.2.3-55-g7522