diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-10-26 12:35:16 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-10-26 15:09:36 +0100 |
| commit | d57a186e0ee06133843e0674cb0a883c05457761 (patch) | |
| tree | c1b9f0022c266e60d9ce1aeeb9e0b6e306f293cb /tests.as-root | |
| parent | 15243493b945d87bc56d625b722060dd10799d15 (diff) | |
| download | morph-d57a186e0ee06133843e0674cb0a883c05457761.tar.gz | |
Write /etc/os-release in system images
This is intended to for human consumption, with the full set of
metadata in /baserock/system-artifact-name.meta. It currently lists
system name, the symbolic ref of the system morphology and build date.
Diffstat (limited to 'tests.as-root')
6 files changed, 11 insertions, 0 deletions
diff --git a/tests.as-root/disk-builds-rootfs-and-kernel.script b/tests.as-root/disk-builds-rootfs-and-kernel.script index 3b9174c2..0b3207e2 100755 --- a/tests.as-root/disk-builds-rootfs-and-kernel.script +++ b/tests.as-root/disk-builds-rootfs-and-kernel.script @@ -105,5 +105,6 @@ trap 'cd /; umount -d "$device"' INT TERM ERR cd "$DATADIR/mnt" find | LC_ALL=C sort -u +sed -e 's/ on [0-9\-]\+//' "$DATADIR/mnt/factory-run/etc/os-release" cd "$DATADIR" umount -d "$device" diff --git a/tests.as-root/disk-builds-rootfs-and-kernel.stdout b/tests.as-root/disk-builds-rootfs-and-kernel.stdout index 929f284d..7600c167 100644 --- a/tests.as-root/disk-builds-rootfs-and-kernel.stdout +++ b/tests.as-root/disk-builds-rootfs-and-kernel.stdout @@ -16,6 +16,7 @@ ./factory-run/boot/vmlinuz ./factory-run/etc ./factory-run/etc/fstab +./factory-run/etc/os-release ./factory/baserock ./factory/baserock/hello.meta ./factory/baserock/linux.meta @@ -28,3 +29,5 @@ ./factory/boot/vmlinuz ./factory/etc ./factory/etc/fstab +./factory/etc/os-release +Baserock system, built from ref custom diff --git a/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.script b/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.script index 746ca3c5..ffe6c1cf 100755 --- a/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.script +++ b/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.script @@ -113,5 +113,6 @@ trap 'cd /; umount -d "$device"' INT TERM ERR cd "$DATADIR/mnt" find | LC_ALL=C sort -u +sed -e 's/ on [0-9\-]\+//' "$DATADIR/mnt/factory-run/etc/os-release" cd "$DATADIR" umount -d "$device" diff --git a/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.stdout b/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.stdout index 1b643875..c5fe4661 100644 --- a/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.stdout +++ b/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.stdout @@ -17,6 +17,7 @@ ./factory-run/boot/vmlinuz ./factory-run/etc ./factory-run/etc/fstab +./factory-run/etc/os-release ./factory-run/extlinux.conf ./factory/baserock ./factory/baserock/hello.meta @@ -30,4 +31,6 @@ ./factory/boot/vmlinuz ./factory/etc ./factory/etc/fstab +./factory/etc/os-release ./factory/extlinux.conf +Baserock system, built from ref custom diff --git a/tests.as-root/tarball-image-is-sensible.script b/tests.as-root/tarball-image-is-sensible.script index 6e4af67b..056cc688 100755 --- a/tests.as-root/tarball-image-is-sensible.script +++ b/tests.as-root/tarball-image-is-sensible.script @@ -34,3 +34,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" diff --git a/tests.as-root/tarball-image-is-sensible.stdout b/tests.as-root/tarball-image-is-sensible.stdout index 46a9409e..4bc5e6fb 100644 --- a/tests.as-root/tarball-image-is-sensible.stdout +++ b/tests.as-root/tarball-image-is-sensible.stdout @@ -16,4 +16,6 @@ ./boot/vmlinuz ./etc/ ./etc/fstab +./etc/os-release ./extlinux.conf +Baserock hello-tarball, built from ref tarball-links |