diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-10-25 11:06:57 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-10-26 13:43:58 +0100 |
| commit | c67afe0431f4abfc16eb9994239c3f21b56ad303 (patch) | |
| tree | 4dcc13c491a68211e375f8ceda0f04491d66a4af /tests.as-root/tarball-image-is-sensible.script | |
| parent | 2bcc7ba44734c73a4a80b40b80a42b1376af5e00 (diff) | |
| download | morph-c67afe0431f4abfc16eb9994239c3f21b56ad303.tar.gz | |
Write metadata for the rootfs itself into the rootfs
This makes it easier to identify what version of a system we are running.
Tests are updated to check inside the contents of the rootfs we created,
and the code to mount the rootfs as a loopback device was extracted out
into tests.as-root/lib
Diffstat (limited to 'tests.as-root/tarball-image-is-sensible.script')
| -rwxr-xr-x | tests.as-root/tarball-image-is-sensible.script | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tests.as-root/tarball-image-is-sensible.script b/tests.as-root/tarball-image-is-sensible.script index 717d8e36..6e4af67b 100755 --- a/tests.as-root/tarball-image-is-sensible.script +++ b/tests.as-root/tarball-image-is-sensible.script @@ -26,14 +26,11 @@ esac . "$SRCDIR/scripts/fix-committer-info" -tar=$("$SRCDIR/morph" \ - --no-default-config --config="$DATADIR/morph.conf" --verbose \ - build-morphology test:morphs-repo tarball-links hello-tarball 2>&1 | - grep "system hello-tarball-rootfs is cached at" | - sed -nre "s/^.*system hello-tarball-rootfs is cached at (\S+)$/\1/p") +tar=$("$SRCDIR/scripts/test-morph" --find-system-artifact \ + build-morphology test:morphs-repo tarball-links hello-tarball) extracted="$DATADIR/extracted" mkdir -p "$extracted" cd "$extracted" tar -xf "$tar" -find . -mindepth 1 | LC_ALL=C sort -u | xargs ls -dF +find . -mindepth 1 | xargs ls -dF | LC_ALL=C sort -u |