summaryrefslogtreecommitdiffstats
path: root/remote/rootfs
diff options
context:
space:
mode:
authorSimon Rettberg2014-01-15 17:02:00 +0100
committerSimon Rettberg2014-01-15 17:02:00 +0100
commit2cb661e2ac1cca78da92b867d8fbf0fa1ddb4274 (patch)
tree75c7364ed0091713947373bcce30d8abb3392c7d /remote/rootfs
parentMove udhcpc stuff to its own module. Was spread across systemd and rootfs-sta... (diff)
parent[packing.inc] change initramfs compression method to xz/lzma (diff)
downloadtm-scripts-2cb661e2ac1cca78da92b867d8fbf0fa1ddb4274.tar.gz
tm-scripts-2cb661e2ac1cca78da92b867d8fbf0fa1ddb4274.tar.xz
tm-scripts-2cb661e2ac1cca78da92b867d8fbf0fa1ddb4274.zip
Merge branch 'master' of dnbd3:openslx-ng/tm-scripts
Diffstat (limited to 'remote/rootfs')
-rwxr-xr-xremote/rootfs/rootfs-stage31/data/bin/activate_sysconfig8
1 files 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}"
}