diff options
author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-10-31 12:56:11 +0000 |
---|---|---|
committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-10-31 12:56:11 +0000 |
commit | 46f84d361f813748231034265c54389b9f9b84c3 (patch) | |
tree | c98717a81b1d97536d50c3cc382e4df3269f4b1b | |
parent | 23f1849b3aa658e9aecf68d10c5e9426e6f70c48 (diff) | |
parent | 7855e6d2be639c60fa9f609942f9af89c576826a (diff) | |
download | definitions-46f84d361f813748231034265c54389b9f9b84c3.tar.gz |
Merge remote-tracking branch 'remotes/origin/baserock/richardmaw/allow-smaller-tmpdir'
Signed-off-by: Lars Wirzenius <lars.wirzenius@codethink.co.uk>
-rwxr-xr-x | scripts/sparse-gunzip | 6 | ||||
-rw-r--r-- | tests.as-root/lib | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/scripts/sparse-gunzip b/scripts/sparse-gunzip new file mode 100755 index 00000000..b6e1aa16 --- /dev/null +++ b/scripts/sparse-gunzip @@ -0,0 +1,6 @@ +#!/usr/bin/python +from morphlib.util import copyfileobj +import gzip, sys +infh = gzip.GzipFile(fileobj=sys.stdin) +copyfileobj(infh, sys.stdout) +infh.close() diff --git a/tests.as-root/lib b/tests.as-root/lib index 6818abde..2492bb53 100644 --- a/tests.as-root/lib +++ b/tests.as-root/lib @@ -21,8 +21,8 @@ loopback_rootfs() { # Find offset partition offset in a rootfs and mount it ROOTFS="$1" - mv "$ROOTFS" "$ROOTFS-unzipped.gz" - gunzip "$ROOTFS-unzipped.gz" + PYTHONPATH="$SRCDIR" "$SRCDIR/scripts/sparse-gunzip" \ + <"$ROOTFS" >"$ROOTFS-unzipped" OFFSET=$(sfdisk -d "$ROOTFS-unzipped" | \ grep -m 1 -o 'start=\s\+\([0-9]\+\)' | awk '{ print $2 }') |