summaryrefslogtreecommitdiff
path: root/tests.as-root
diff options
context:
space:
mode:
authorJonathan Maw <jonathan.maw@codethink.co.uk>2013-07-02 15:59:27 +0000
committerJonathan Maw <jonathan.maw@codethink.co.uk>2013-07-02 17:18:18 +0100
commit945f004cc5bda68d9a847f8dca4970371753c530 (patch)
tree6f382522f6ef091f1b33725ea27bc6a12c72016b /tests.as-root
parent2be46a7d29f54365aa0033ad8d6998f75ca39fcb (diff)
downloadmorph-945f004cc5bda68d9a847f8dca4970371753c530.tar.gz
Update tests in line with changes to os-release
Diffstat (limited to 'tests.as-root')
-rwxr-xr-xtests.as-root/tarball-image-is-sensible.script2
-rw-r--r--tests.as-root/tarball-image-is-sensible.stdout6
2 files changed, 6 insertions, 2 deletions
diff --git a/tests.as-root/tarball-image-is-sensible.script b/tests.as-root/tarball-image-is-sensible.script
index e36cdb5a..0fb6d9b2 100755
--- a/tests.as-root/tarball-image-is-sensible.script
+++ b/tests.as-root/tarball-image-is-sensible.script
@@ -41,4 +41,4 @@ mkdir -p "$extracted"
cd "$extracted"
tar -xf "$tar"
find . -mindepth 1 | xargs ls -dF | LC_ALL=C sort -u
-sed -e 's/ on [0-9\-]\+//' "$extracted/etc/os-release"
+cat "$extracted/etc/os-release"
diff --git a/tests.as-root/tarball-image-is-sensible.stdout b/tests.as-root/tarball-image-is-sensible.stdout
index 4bc5e6fb..c896c847 100644
--- a/tests.as-root/tarball-image-is-sensible.stdout
+++ b/tests.as-root/tarball-image-is-sensible.stdout
@@ -18,4 +18,8 @@
./etc/fstab
./etc/os-release
./extlinux.conf
-Baserock hello-tarball, built from ref tarball-links
+NAME="Baserock"
+ID=baserock
+HOME_URL="http://wiki.baserock.org"
+SUPPORT_URL="http://wiki.baserock.org/mailinglist"
+BUG_REPORT_URL="http://wiki.baserock.org/mailinglist"