2:52 p.m.
Repository: git://git.baserock.org/baserock/morph
Branch: samthursfield/write-metadata-for-system
Sha1: da7d5efb5bf3b93642dcb79d8ae24521f93975d0
This makes it much easier to identify what version of a system you
are running.
Tests improved as part of this to actually test the generated disk
images a bit.
Does anyone have any view on whether we should also set /etc/os-release
at this point? Something like "Baserock system xxx built from ref xxx
at xxx" ?
Sam Thursfield (1):
Write metadata for the rootfs itself into the rootfs
morphlib/builder2.py | 5 +--
morphlib/plugins/tarball-systembuilder_plugin.py | 1 +
tests.as-root/disk-builds-rootfs-and-kernel.script | 15 ++++++--
tests.as-root/disk-builds-rootfs-and-kernel.stdout | 30 ++++++++++++++++
tests.as-root/lib | 37 ++++++++++++++++++++
.../rootfs-tarball-builds-rootfs-and-kernel.script | 1 -
.../syslinux-disk-builds-rootfs-and-kernel.script | 14 ++++++++
tests.as-root/tarball-image-is-sensible.stdout | 1 +
8 files changed, 99 insertions(+), 5 deletions(-)
create mode 100644 tests.as-root/disk-builds-rootfs-and-kernel.stdout
create mode 100644 tests.as-root/lib
create mode 100644 tests.as-root/syslinux-disk-builds-rootfs-and-kernel.stdout
--
1.7.10.4
2:52 p.m.
This makes it easier to identify what version of a system we are running.
---
morphlib/builder2.py | 5 +--
morphlib/plugins/tarball-systembuilder_plugin.py | 1 +
tests.as-root/disk-builds-rootfs-and-kernel.script | 15 ++++++--
tests.as-root/disk-builds-rootfs-and-kernel.stdout | 30 ++++++++++++++++
tests.as-root/lib | 37 ++++++++++++++++++++
.../rootfs-tarball-builds-rootfs-and-kernel.script | 1 -
.../syslinux-disk-builds-rootfs-and-kernel.script | 14 ++++++++
tests.as-root/tarball-image-is-sensible.stdout | 1 +
8 files changed, 99 insertions(+), 5 deletions(-)
create mode 100644 tests.as-root/disk-builds-rootfs-and-kernel.stdout
create mode 100644 tests.as-root/lib
create mode 100644 tests.as-root/syslinux-disk-builds-rootfs-and-kernel.stdout
diff --git a/morphlib/builder2.py b/morphlib/builder2.py
index 565fdf4..d376805 100644
--- a/morphlib/builder2.py
+++ b/morphlib/builder2.py
@@ -662,8 +662,8 @@ class DiskImageBuilder(SystemKindBuilder): # pragma: no cover
with self.build_watch('overall-build'):
arch = self.artifact.source.morphology['arch']
- rootfs_artifact = self.new_artifact(
- self.artifact.source.morphology['name'] + '-rootfs')
+ rootfs_name = self.artifact.source.morphology['name'] +
'-rootfs'
+ rootfs_artifact = self.new_artifact(rootfs_name)
handle = self.local_artifact_cache.put(rootfs_artifact)
(image_file_fd, image_name) = \
tempfile.mkstemp(dir=self.app.settings['tempdir'])
@@ -682,6 +682,7 @@ class DiskImageBuilder(SystemKindBuilder): # pragma: no cover
factory_path = os.path.join(mount_point, 'factory')
self._create_subvolume(factory_path)
self.unpack_strata(factory_path)
+ self.write_metadata(factory_path, rootfs_name)
self.create_fstab(factory_path)
self._create_bootloader_config(factory_path)
self._create_subvolume_snapshot(
diff --git a/morphlib/plugins/tarball-systembuilder_plugin.py
b/morphlib/plugins/tarball-systembuilder_plugin.py
index 95cae4c..1480792 100644
--- a/morphlib/plugins/tarball-systembuilder_plugin.py
+++ b/morphlib/plugins/tarball-systembuilder_plugin.py
@@ -49,6 +49,7 @@ class RootfsTarballBuilder(SystemKindBuilder): # pragma: no cover
try:
fs_root = self.staging_area.destdir(self.artifact.source)
self.unpack_strata(fs_root)
+ self.write_metadata(fs_root, rootfs_name)
self.create_fstab(fs_root)
self.copy_kernel_into_artifact_cache(fs_root)
unslashy_root = fs_root[1:]
diff --git a/tests.as-root/disk-builds-rootfs-and-kernel.script
b/tests.as-root/disk-builds-rootfs-and-kernel.script
index f9748ca..b8f7cc9 100755
--- a/tests.as-root/disk-builds-rootfs-and-kernel.script
+++ b/tests.as-root/disk-builds-rootfs-and-kernel.script
@@ -19,6 +19,8 @@
set -eu
+. "$SRCDIR/tests.as-root/lib"
+
cache="$DATADIR/cache/artifacts"
kernelrepo="$DATADIR/kernel-repo"
morphsrepo="$DATADIR/morphs-repo"
@@ -83,8 +85,11 @@ git add linux.morph
git commit --quiet -m 'Make the kernel create a dummy zImage'
-"$SRCDIR/scripts/test-morph" \
- build-morphology test:morphs-repo custom system > /dev/null
+rootfs=$("$SRCDIR/morph" \
+ --no-default-config --config="$DATADIR/morph.conf" --verbose \
+ build-morphology test:morphs-repo custom system 2>&1 |
+ grep "system system-rootfs is cached at" |
+ sed -nre "s/^.*system system-rootfs is cached at (\S+)$/\1/p")
for suffix in kernel rootfs
do
@@ -96,3 +101,9 @@ do
fi
done
+rootfs_mount_dir=$(loopback_mount_rootfs $rootfs)
+
+cd "$rootfs_mount_dir"
+find | sort
+cd "$DATADIR"
+umount $rootfs_mount_dir
diff --git a/tests.as-root/disk-builds-rootfs-and-kernel.stdout
b/tests.as-root/disk-builds-rootfs-and-kernel.stdout
new file mode 100644
index 0000000..929f284
--- /dev/null
+++ b/tests.as-root/disk-builds-rootfs-and-kernel.stdout
@@ -0,0 +1,30 @@
+.
+./boot
+./boot/System.map
+./boot/vmlinuz
+./factory
+./factory-run
+./factory-run/baserock
+./factory-run/baserock/hello.meta
+./factory-run/baserock/linux.meta
+./factory-run/baserock/stratum.meta
+./factory-run/baserock/system-rootfs.meta
+./factory-run/bin
+./factory-run/bin/hello
+./factory-run/boot
+./factory-run/boot/System.map
+./factory-run/boot/vmlinuz
+./factory-run/etc
+./factory-run/etc/fstab
+./factory/baserock
+./factory/baserock/hello.meta
+./factory/baserock/linux.meta
+./factory/baserock/stratum.meta
+./factory/baserock/system-rootfs.meta
+./factory/bin
+./factory/bin/hello
+./factory/boot
+./factory/boot/System.map
+./factory/boot/vmlinuz
+./factory/etc
+./factory/etc/fstab
diff --git a/tests.as-root/lib b/tests.as-root/lib
new file mode 100644
index 0000000..c5b7142
--- /dev/null
+++ b/tests.as-root/lib
@@ -0,0 +1,37 @@
+#!/bin/sh
+#
+# Copyright (C) 2012 Codethink Limited
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+# Helper functions for as-root tests
+
+loopback_mount_rootfs() {
+ # Find offset partition offset in a rootfs and mount it
+ ROOTFS=$1
+
+ mv $ROOTFS $ROOTFS.gz
+ gunzip $ROOTFS.gz
+ OFFSET=$(sfdisk -d $ROOTFS | \
+ grep -m 1 -o 'start=\s\+\([0-9]\+\)' | \
+ awk '{ print $2 }')
+ OFFSET=$(expr $OFFSET \* 512)
+
+ DEVICE=$(losetup --show -o $OFFSET -f $ROOTFS)
+
+ mkdir -p "$DATADIR/mnt"
+ mount $DEVICE "$DATADIR/mnt"
+
+ echo "$DATADIR/mnt"
+}
diff --git a/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script
b/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script
index ab0186c..99b5b73 100755
--- a/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script
+++ b/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script
@@ -100,4 +100,3 @@ do
exit 1
fi
done
-
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 f996aaa..924889d 100755
--- a/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.script
+++ b/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.script
@@ -20,6 +20,8 @@
set -eu
+. "$SRCDIR/tests.as-root/lib"
+
# We only support x86 systems with syslinux-disk.
arch=$(uname -m)
case "$arch" in
@@ -90,6 +92,12 @@ git add linux.morph
git commit --quiet -m 'Make the kernel create a dummy zImage'
+rootfs=$("$SRCDIR/morph" \
+ --no-default-config --config="$DATADIR/morph.conf" --verbose \
+ build-morphology test:morphs-repo custom system 2>&1 |
+ grep "system system-rootfs is cached at" |
+ sed -nre "s/^.*system system-rootfs is cached at (\S+)$/\1/p")
+
"$SRCDIR/scripts/test-morph" \
build-morphology test:morphs-repo custom system > /dev/null
@@ -103,3 +111,9 @@ do
fi
done
+rootfs_mount_dir=$(loopback_mount_rootfs $rootfs)
+
+cd "$rootfs_mount_dir"
+find | sort
+cd "$DATADIR"
+umount $rootfs_mount_dir
diff --git a/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.stdout
b/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.stdout
new file mode 100644
index 0000000..e69de29
diff --git a/tests.as-root/tarball-image-is-sensible.stdout
b/tests.as-root/tarball-image-is-sensible.stdout
index 34eb675..46a9409 100644
--- a/tests.as-root/tarball-image-is-sensible.stdout
+++ b/tests.as-root/tarball-image-is-sensible.stdout
@@ -1,5 +1,6 @@
./baserock/
./baserock/hello-stratum.meta
+./baserock/hello-tarball-rootfs.meta
./baserock/hello.meta
./baserock/link-stratum.meta
./baserock/links.meta
--
1.7.10.4
3:14 p.m.
On Thu, Oct 25, 2012 at 01:52:20PM +0100, Sam Thursfield wrote:
This makes it easier to identify what version of a system we are
running.
diff --git a/tests.as-root/disk-builds-rootfs-and-kernel.script
b/tests.as-root/disk-builds-rootfs-and-kernel.script
index f9748ca..b8f7cc9 100755
--- a/tests.as-root/disk-builds-rootfs-and-kernel.script
+++ b/tests.as-root/disk-builds-rootfs-and-kernel.script
@@ -83,8 +85,11 @@ git add linux.morph
git commit --quiet -m 'Make the kernel create a dummy zImage'
-"$SRCDIR/scripts/test-morph" \
- build-morphology test:morphs-repo custom system > /dev/null
+rootfs=$("$SRCDIR/morph" \
+ --no-default-config --config="$DATADIR/morph.conf" --verbose \
+ build-morphology test:morphs-repo custom system 2>&1 |
+ grep "system system-rootfs is cached at" |
+ sed -nre "s/^.*system system-rootfs is cached at (\S+)$/\1/p")
for suffix in kernel rootfs
do
I can see us needing to do this grep to find the rootfs a lot, it may be
more convenient to have it as a shell function, or helper script.
@@ -96,3 +101,9 @@ do
fi
done
+rootfs_mount_dir=$(loopback_mount_rootfs $rootfs)
$rootfs should be quoted, I think if TMPDIR is set to a path with
spaces, then this would fail.
+cd "$rootfs_mount_dir"
+find | sort
The find generates more output than is strictly needed for the test, I
would instead limit it to one of the subvolumes as that contains all the
required files.
sort should be run as LC_ALL=C sort, so that locale settings don't cause
it to fail.
+cd "$DATADIR"
+umount $rootfs_mount_dir
$rootfs_mount_dir should be quoted
diff --git a/tests.as-root/lib b/tests.as-root/lib
new file mode 100644
index 0000000..c5b7142
--- /dev/null
+++ b/tests.as-root/lib
@@ -0,0 +1,37 @@
snip
+loopback_mount_rootfs() {
+ # Find offset partition offset in a rootfs and mount it
+ ROOTFS=$1
$1 should be quoted
+
+ mv $ROOTFS $ROOTFS.gz
+ gunzip $ROOTFS.gz
+ OFFSET=$(sfdisk -d $ROOTFS | \
+ grep -m 1 -o 'start=\s\+\([0-9]\+\)' | \
+ awk '{ print $2 }')
+ OFFSET=$(expr $OFFSET \* 512)
I would use $(("$OFFSET" * 512)), since we're already requiring bash
elsewhere. The assumption that block sizes are 512 is becoming less
true, but I think it's still ok for virtual disks.
+
+ DEVICE=$(losetup --show -o $OFFSET -f $ROOTFS)
$ROOTFS and $OFFSET should be quoted
+
+ mkdir -p "$DATADIR/mnt"
+ mount $DEVICE "$DATADIR/mnt"
$DEVICE should be quoted
+ echo "$DATADIR/mnt"
+}
Some other tests need to do loopback_mount_rootfs, using different
implementations, it may be worth consolidating these.
syslinux-disk-builds-rootfs-and-kernel also needs quoting.
5:08 p.m.
On 10/25/2012 02:14 PM, Richard Maw wrote:
On Thu, Oct 25, 2012 at 01:52:20PM +0100, Sam Thursfield wrote:
> This makes it easier to identify what version of a system we are running.
> diff --git a/tests.as-root/disk-builds-rootfs-and-kernel.script
b/tests.as-root/disk-builds-rootfs-and-kernel.script
> index f9748ca..b8f7cc9 100755
> --- a/tests.as-root/disk-builds-rootfs-and-kernel.script
> +++ b/tests.as-root/disk-builds-rootfs-and-kernel.script
> @@ -83,8 +85,11 @@ git add linux.morph
>
> git commit --quiet -m 'Make the kernel create a dummy zImage'
>
> -"$SRCDIR/scripts/test-morph" \
> - build-morphology test:morphs-repo custom system > /dev/null
> +rootfs=$("$SRCDIR/morph" \
> + --no-default-config --config="$DATADIR/morph.conf" --verbose \
> + build-morphology test:morphs-repo custom system 2>&1 |
> + grep "system system-rootfs is cached at" |
> + sed -nre "s/^.*system system-rootfs is cached at (\S+)$/\1/p")
>
> for suffix in kernel rootfs
> do
I can see us needing to do this grep to find the rootfs a lot, it may be
more convenient to have it as a shell function, or helper script.
> @@ -96,3 +101,9 @@ do
> fi
> done
>
> +rootfs_mount_dir=$(loopback_mount_rootfs $rootfs)
$rootfs should be quoted, I think if TMPDIR is set to a path with
spaces, then this would fail.
> +cd "$rootfs_mount_dir"
> +find | sort
The find generates more output than is strictly needed for the test, I
would instead limit it to one of the subvolumes as that contains all the
required files.
I don't think it does any harm having more output; it shows the
subvolumes have been created correctly, for example.
sort should be run as LC_ALL=C sort, so that locale settings don't cause
it to fail.
> +cd "$DATADIR"
> +umount $rootfs_mount_dir
We should be running all the tests with LOCALE="C", surely? Otherwise,
bad times all round.
$rootfs_mount_dir should be quoted
> diff --git a/tests.as-root/lib b/tests.as-root/lib
> new file mode 100644
> index 0000000..c5b7142
> --- /dev/null
> +++ b/tests.as-root/lib
> @@ -0,0 +1,37 @@
snip
> +loopback_mount_rootfs() {
> + # Find offset partition offset in a rootfs and mount it
> + ROOTFS=$1
$1 should be quoted
> +
> + mv $ROOTFS $ROOTFS.gz
> + gunzip $ROOTFS.gz
> + OFFSET=$(sfdisk -d $ROOTFS | \
> + grep -m 1 -o 'start=\s\+\([0-9]\+\)' | \
> + awk '{ print $2 }')
> + OFFSET=$(expr $OFFSET \* 512)
I would use $(("$OFFSET" * 512)), since we're already requiring bash
elsewhere. The assumption that block sizes are 512 is becoming less
true, but I think it's still ok for virtual disks.
This is what we do in fsutils.py in Morph, so it should work :)
> +
> + DEVICE=$(losetup --show -o $OFFSET -f $ROOTFS)
$ROOTFS and $OFFSET should be quoted
> +
> + mkdir -p "$DATADIR/mnt"
> + mount $DEVICE "$DATADIR/mnt"
$DEVICE should be quoted
> + echo "$DATADIR/mnt"
> +}
Some other tests need to do loopback_mount_rootfs, using different
implementations, it may be worth consolidating these.
syslinux-disk-builds-rootfs-and-kernel also needs quoting.
I agree with all the quoting, consolidation etc. Thanks!
Sam
5:17 p.m.
On Thu, Oct 25, 2012 at 04:08:28PM +0100, Sam Thursfield wrote:
On 10/25/2012 02:14 PM, Richard Maw wrote:
>On Thu, Oct 25, 2012 at 01:52:20PM +0100, Sam Thursfield wrote:
>>+ mv $ROOTFS $ROOTFS.gz
>>+ gunzip $ROOTFS.gz
>>+ OFFSET=$(sfdisk -d $ROOTFS | \
>>+ grep -m 1 -o 'start=\s\+\([0-9]\+\)' | \
>>+ awk '{ print $2 }')
>>+ OFFSET=$(expr $OFFSET \* 512)
>
>I would use $(("$OFFSET" * 512)), since we're already requiring bash
>elsewhere. The assumption that block sizes are 512 is becoming less
>true, but I think it's still ok for virtual disks.
This is what we do in fsutils.py in Morph, so it should work :)
I remember the discussion, I think stat may say the size, and there's
something in the sysfs which can say the block sizes, but until we
encounter a disk type with blocks that aren't 512 bytes it's not worth
the headache.
3:17 p.m.
On Thu, Oct 25, 2012 at 01:52:19PM +0100, Sam Thursfield wrote:
Repository: git://git.baserock.org/baserock/morph
Branch: samthursfield/write-metadata-for-system
Sha1: da7d5efb5bf3b93642dcb79d8ae24521f93975d0
Does anyone have any view on whether we should also set /etc/os-release
at this point? Something like "Baserock system xxx built from ref xxx
at xxx" ?
If it's unpetrified, then it's not really useful to say what the commit
is. If petrification is detected, and included in this, then I would say
that is useful, but I would warn that it isn't a petrified commit.
In general I think it is a good idea too.
Sam Thursfield (1):
Write metadata for the rootfs itself into the rootfs
morphlib/builder2.py | 5 +--
morphlib/plugins/tarball-systembuilder_plugin.py | 1 +
tests.as-root/disk-builds-rootfs-and-kernel.script | 15 ++++++--
tests.as-root/disk-builds-rootfs-and-kernel.stdout | 30 ++++++++++++++++
tests.as-root/lib | 37 ++++++++++++++++++++
.../rootfs-tarball-builds-rootfs-and-kernel.script | 1 -
.../syslinux-disk-builds-rootfs-and-kernel.script | 14 ++++++++
tests.as-root/tarball-image-is-sensible.stdout | 1 +
8 files changed, 99 insertions(+), 5 deletions(-)
create mode 100644 tests.as-root/disk-builds-rootfs-and-kernel.stdout
create mode 100644 tests.as-root/lib
create mode 100644 tests.as-root/syslinux-disk-builds-rootfs-and-kernel.stdout
--
1.7.10.4
_______________________________________________
baserock-dev mailing list
baserock-dev(a)baserock.org
http://vlists.pepperfish.net/cgi-bin/mailman/listinfo/baserock-dev-basero...
3:37 p.m.
On Thu, Oct 25, 2012 at 02:17:13PM +0100, Richard Maw wrote:
On Thu, Oct 25, 2012 at 01:52:19PM +0100, Sam Thursfield wrote:
> Repository: git://git.baserock.org/baserock/morph
> Branch: samthursfield/write-metadata-for-system
> Sha1: da7d5efb5bf3b93642dcb79d8ae24521f93975d0
>
> Does anyone have any view on whether we should also set /etc/os-release
> at this point? Something like "Baserock system xxx built from ref xxx
> at xxx" ?
If it's unpetrified, then it's not really useful to say what the commit
is. If petrification is detected, and included in this, then I would say
that is useful, but I would warn that it isn't a petrified commit.
In general I think it is a good idea too.
Embedding both the symbolic ref and the sha1 in /etc/os-release sounds good
to me.
--
http://www.codethink.co.uk/
3:49 p.m.
On Thu, Oct 25, 2012 at 02:37:06PM +0100, Lars Wirzenius wrote:
Embedding both the symbolic ref and the sha1 in /etc/os-release
sounds good
to me.
If nothing else, we need to know the SHAs of the system and stratum
morphologies so that we *can* reproduce a build, even if we'd have to build
some petrified morphologies from the contents of /baserock later.
(Manic idea: Whenever we build, we inject petrified stratum morphologies and a
copy of the system morphology into /baserock. Would that be useful/an-answer?)
Also, how about /etc/lsb-release ? (Are we going for LSB ?)
D.
--
Daniel Silverstone http://www.codethink.co.uk/
Senior Developer GPG 4096/R Key Id: 3CCE BABE 206C 3B69
4 p.m.
On 10/25/2012 02:49 PM, Daniel Silverstone wrote:
On Thu, Oct 25, 2012 at 02:37:06PM +0100, Lars Wirzenius wrote:
> Embedding both the symbolic ref and the sha1 in /etc/os-release sounds good
> to me.
If nothing else, we need to know the SHAs of the system and stratum
morphologies so that we *can* reproduce a build, even if we'd have to build
some petrified morphologies from the contents of /baserock later.
We already have .meta files in /baserock for the strata and now for the
system as well, which have the symbolic refs and sha1s.
(Manic idea: Whenever we build, we inject petrified stratum
morphologies and a
copy of the system morphology into /baserock. Would that be useful/an-answer?)
Or are you talking about making builds reproducible even from
uncommitted changes? In that case we don't have the changes in the chunk
repos, so having a copy of the strata isn't much help
Also, how about /etc/lsb-release ? (Are we going for LSB ?)
No idea. Lars?
4:47 p.m.
On Thu, Oct 25, 2012 at 03:00:49PM +0100, Sam Thursfield wrote:
>Also, how about /etc/lsb-release ? (Are we going for LSB ?)
No idea. Lars?
My opinion: We'll do LSB if and when there is a clear use case for it,
and preferably a paying customer.
--
http://www.codethink.co.uk/
4:50 p.m.
On Thu, Oct 25, 2012 at 03:00:49PM +0100, Sam Thursfield wrote:
On 10/25/2012 02:49 PM, Daniel Silverstone wrote:
>On Thu, Oct 25, 2012 at 02:37:06PM +0100, Lars Wirzenius wrote:
>(Manic idea: Whenever we build, we inject petrified stratum morphologies and a
>copy of the system morphology into /baserock. Would that be useful/an-answer?)
Or are you talking about making builds reproducible even from
uncommitted changes? In that case we don't have the changes in the
chunk repos, so having a copy of the strata isn't much help
I interpreted that as a shortcut to finding the System and Stratum
morphologies used and petrifying based on the sha1 in the chunks.
Instead we can just find the stratum morphologies and system morphology,
and they're already petrified, just needing to be copied into a
branch.
4 p.m.
On Thu, Oct 25, 2012 at 02:49:22PM +0100, Daniel Silverstone wrote:
On Thu, Oct 25, 2012 at 02:37:06PM +0100, Lars Wirzenius wrote:
> Embedding both the symbolic ref and the sha1 in /etc/os-release sounds good
> to me.
If nothing else, we need to know the SHAs of the system and stratum
morphologies so that we *can* reproduce a build, even if we'd have to build
some petrified morphologies from the contents of /baserock later.
(Manic idea: Whenever we build, we inject petrified stratum morphologies and a
copy of the system morphology into /baserock. Would that be useful/an-answer?)
With the patch for including the system metadata, it should now be
possible to construct a petrified morphology, by finding the system (a
symlink under a fixed name would make this quicker) then looking up
sha1s from the contents of /baserock/ should work.
I don't like the idea of including the morphologies themselves, as this
is redundant data, assuming the morphologies exist in version control.
12:27 p.m.
New subject: [PATCH] V2: Write metadata for the rootfs itself into the rootfs
Repository: git://git.baserock.org/baserock/morph
Branch: samthursfield/write-metadata-for-system
Sha1: 18ed6becb2a996173315d351b952776701830260
Various fixes:
* trap ERR as well as INT and TERM, so test failures triggered by
'set -e' trigger automatic loopback unmount (and change the tests
to use /bin/bash so 'trap ERR' works)
* Move code to extract rootfs artifact path from Morph output into
scripts/test-morph
* Fixe a bunch of stuff in the loopback_mount_rootfs() function;
unmounting and deleting the loopback device works on Fedora, Squeeze
and Baserock now.
* Escape everything correctly
* Use LC_ALL=C for sorting
Sam Thursfield (1):
Write metadata for the rootfs itself into the rootfs
morphlib/builder2.py | 5 +-
morphlib/plugins/tarball-systembuilder_plugin.py | 1 +
scripts/test-morph | 24 ++++++++--
tests.as-root/disk-builds-rootfs-and-kernel.script | 17 +++++--
tests.as-root/disk-builds-rootfs-and-kernel.stdout | 30 ++++++++++++
tests.as-root/lib | 48 ++++++++++++++++++++
tests.as-root/make-patch.script | 32 ++++---------
.../rootfs-tarball-builds-rootfs-and-kernel.script | 1 -
.../syslinux-disk-builds-rootfs-and-kernel.script | 17 ++++++-
.../syslinux-disk-builds-rootfs-and-kernel.stdout | 33 ++++++++++++++
tests.as-root/tarball-image-is-sensible.script | 9 ++--
tests.as-root/tarball-image-is-sensible.stdout | 1 +
12 files changed, 179 insertions(+), 39 deletions(-)
create mode 100644 tests.as-root/disk-builds-rootfs-and-kernel.stdout
create mode 100644 tests.as-root/lib
create mode 100644 tests.as-root/syslinux-disk-builds-rootfs-and-kernel.stdout
--
1.7.10.4
12:27 p.m.
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
---
morphlib/builder2.py | 5 +-
morphlib/plugins/tarball-systembuilder_plugin.py | 1 +
scripts/test-morph | 24 ++++++++--
tests.as-root/disk-builds-rootfs-and-kernel.script | 17 +++++--
tests.as-root/disk-builds-rootfs-and-kernel.stdout | 30 ++++++++++++
tests.as-root/lib | 48 ++++++++++++++++++++
tests.as-root/make-patch.script | 32 ++++---------
.../rootfs-tarball-builds-rootfs-and-kernel.script | 1 -
.../syslinux-disk-builds-rootfs-and-kernel.script | 17 ++++++-
.../syslinux-disk-builds-rootfs-and-kernel.stdout | 33 ++++++++++++++
tests.as-root/tarball-image-is-sensible.script | 9 ++--
tests.as-root/tarball-image-is-sensible.stdout | 1 +
12 files changed, 179 insertions(+), 39 deletions(-)
create mode 100644 tests.as-root/disk-builds-rootfs-and-kernel.stdout
create mode 100644 tests.as-root/lib
create mode 100644 tests.as-root/syslinux-disk-builds-rootfs-and-kernel.stdout
diff --git a/morphlib/builder2.py b/morphlib/builder2.py
index 565fdf4..d376805 100644
--- a/morphlib/builder2.py
+++ b/morphlib/builder2.py
@@ -662,8 +662,8 @@ class DiskImageBuilder(SystemKindBuilder): # pragma: no cover
with self.build_watch('overall-build'):
arch = self.artifact.source.morphology['arch']
- rootfs_artifact = self.new_artifact(
- self.artifact.source.morphology['name'] + '-rootfs')
+ rootfs_name = self.artifact.source.morphology['name'] +
'-rootfs'
+ rootfs_artifact = self.new_artifact(rootfs_name)
handle = self.local_artifact_cache.put(rootfs_artifact)
(image_file_fd, image_name) = \
tempfile.mkstemp(dir=self.app.settings['tempdir'])
@@ -682,6 +682,7 @@ class DiskImageBuilder(SystemKindBuilder): # pragma: no cover
factory_path = os.path.join(mount_point, 'factory')
self._create_subvolume(factory_path)
self.unpack_strata(factory_path)
+ self.write_metadata(factory_path, rootfs_name)
self.create_fstab(factory_path)
self._create_bootloader_config(factory_path)
self._create_subvolume_snapshot(
diff --git a/morphlib/plugins/tarball-systembuilder_plugin.py
b/morphlib/plugins/tarball-systembuilder_plugin.py
index 95cae4c..1480792 100644
--- a/morphlib/plugins/tarball-systembuilder_plugin.py
+++ b/morphlib/plugins/tarball-systembuilder_plugin.py
@@ -49,6 +49,7 @@ class RootfsTarballBuilder(SystemKindBuilder): # pragma: no cover
try:
fs_root = self.staging_area.destdir(self.artifact.source)
self.unpack_strata(fs_root)
+ self.write_metadata(fs_root, rootfs_name)
self.create_fstab(fs_root)
self.copy_kernel_into_artifact_cache(fs_root)
unslashy_root = fs_root[1:]
diff --git a/scripts/test-morph b/scripts/test-morph
index 2b7fb57..fb3e2cd 100755
--- a/scripts/test-morph
+++ b/scripts/test-morph
@@ -27,7 +27,25 @@ set -eu
# distributed builds, which invoke morph as a sub-process.
export PATH="$SRCDIR:$PATH"
-"$SRCDIR/scripts/cmd-filter" "$SRCDIR/morph" --no-default-config \
- --tarball-server= --cache-server= \
- --config="$DATADIR/morph.conf" "$@"
+if [ "$1" = "--find-system-artifact" ]; then
+ shift
+ "$SRCDIR/morph" --no-default-config \
+ --tarball-server= --cache-server= \
+ --config="$DATADIR/morph.conf" --verbose "$@" >
$DATADIR/stdout
+
+ ARTIFACT=$(grep "system \S\+-rootfs is cached at"
"$DATADIR/stdout" | \
+ sed -nre "s/^.*system \S+-rootfs is cached at (\S+)$/\1/p")
+ rm "$DATADIR/stdout"
+
+ if [ ! -e "$ARTIFACT" ]; then
+ echo "Unable to find rootfs artifact: $ARTIFACT" 1>&2
+ exit 1
+ fi
+
+ echo $ARTIFACT
+else
+ "$SRCDIR/scripts/cmd-filter" "$SRCDIR/morph" --no-default-config
\
+ --tarball-server= --cache-server= \
+ --config="$DATADIR/morph.conf" "$@"
+fi
diff --git a/tests.as-root/disk-builds-rootfs-and-kernel.script
b/tests.as-root/disk-builds-rootfs-and-kernel.script
index f9748ca..20f4775 100755
--- a/tests.as-root/disk-builds-rootfs-and-kernel.script
+++ b/tests.as-root/disk-builds-rootfs-and-kernel.script
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
#
# A system kind of 'disk' should create the disk image, plus a kernel file.
#
@@ -19,6 +19,8 @@
set -eu
+. "$SRCDIR/tests.as-root/lib"
+
cache="$DATADIR/cache/artifacts"
kernelrepo="$DATADIR/kernel-repo"
morphsrepo="$DATADIR/morphs-repo"
@@ -83,8 +85,8 @@ git add linux.morph
git commit --quiet -m 'Make the kernel create a dummy zImage'
-"$SRCDIR/scripts/test-morph" \
- build-morphology test:morphs-repo custom system > /dev/null
+rootfs=$("$SRCDIR/scripts/test-morph" --find-system-artifact \
+ build-morphology test:morphs-repo custom system)
for suffix in kernel rootfs
do
@@ -96,3 +98,12 @@ do
fi
done
+mkdir -p "$DATADIR/mnt"
+device=$(loopback_rootfs "$rootfs")
+mount "$device" "$DATADIR/mnt"
+trap 'cd /; loopback_unmount "$device"' INT TERM ERR
+
+cd "$DATADIR/mnt"
+find | LC_ALL=C sort -u
+cd "$DATADIR"
+loopback_unmount "$device"
diff --git a/tests.as-root/disk-builds-rootfs-and-kernel.stdout
b/tests.as-root/disk-builds-rootfs-and-kernel.stdout
new file mode 100644
index 0000000..929f284
--- /dev/null
+++ b/tests.as-root/disk-builds-rootfs-and-kernel.stdout
@@ -0,0 +1,30 @@
+.
+./boot
+./boot/System.map
+./boot/vmlinuz
+./factory
+./factory-run
+./factory-run/baserock
+./factory-run/baserock/hello.meta
+./factory-run/baserock/linux.meta
+./factory-run/baserock/stratum.meta
+./factory-run/baserock/system-rootfs.meta
+./factory-run/bin
+./factory-run/bin/hello
+./factory-run/boot
+./factory-run/boot/System.map
+./factory-run/boot/vmlinuz
+./factory-run/etc
+./factory-run/etc/fstab
+./factory/baserock
+./factory/baserock/hello.meta
+./factory/baserock/linux.meta
+./factory/baserock/stratum.meta
+./factory/baserock/system-rootfs.meta
+./factory/bin
+./factory/bin/hello
+./factory/boot
+./factory/boot/System.map
+./factory/boot/vmlinuz
+./factory/etc
+./factory/etc/fstab
diff --git a/tests.as-root/lib b/tests.as-root/lib
new file mode 100644
index 0000000..de7ba70
--- /dev/null
+++ b/tests.as-root/lib
@@ -0,0 +1,48 @@
+#!/bin/sh
+#
+# Copyright (C) 2012 Codethink Limited
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+# Helper functions for as-root tests
+
+loopback_rootfs() {
+ # Find offset partition offset in a rootfs and mount it
+ ROOTFS="$1"
+
+ mv $ROOTFS $ROOTFS-unzipped.gz
+ gunzip $ROOTFS-unzipped.gz
+
+ OFFSET=$(sfdisk -d $ROOTFS-unzipped | \
+ grep -m 1 -o 'start=\s\+\([0-9]\+\)' | awk '{ print $2 }')
+ OFFSET=$(expr $OFFSET '*' 512)
+
+ DEVICE=$(losetup --show -o "$OFFSET" -f "$ROOTFS-unzipped")
+ udevadm settle
+
+ echo $DEVICE
+}
+
+loopback_unmount() {
+ # BusyBox and GNU umount have opposite behaviour with regards to
+ # deleting the loopback device automatically, and there is no easy
+ # way to reconcile them.
+ DEVICE="$1"
+
+ umount "$DEVICE"
+
+ if losetup -a | grep -q "$DEVICE" ; then
+ losetup -d "$DEVICE"
+ fi
+}
diff --git a/tests.as-root/make-patch.script b/tests.as-root/make-patch.script
index 031ecb6..49da0f4 100755
--- a/tests.as-root/make-patch.script
+++ b/tests.as-root/make-patch.script
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
#
# Test making a patch between two different system images
#
@@ -19,6 +19,8 @@
set -eu
+. "$SRCDIR/tests.as-root/lib"
+
# Make a stratum that include hello and kernel chunks.
cat <<EOF > "$DATADIR/morphs-repo/hello-stratum.morph"
{
@@ -89,26 +91,10 @@ Done.
EOF
exit 0
-# find out the offset of the partition in the disk image
-# udevadm settle is used to wait until devices have appeared
-loop=$(losetup -f --show "$img1")
-udevadm settle
-offset=$(sfdisk -d "$loop" |
- sed -n '/start=/s/^.*start=\s*\([0-9]\+\)[^0-9].*$/\1/p' |
- head -n 1)
-ssz=`cat "/sys/devices/virtual/block/$(basename
"$loop")/queue/hw_sector_size"`
-losetup -d "$loop"
-udevadm settle
-
-# mount the disk
-mkdir "$DATADIR/unpacked"
-# this has to be done by losetup then mount, because busybox mount doesn't
-# accept the -o offset= option
-loop=$(losetup -o "$(expr "$offset" '*' "$ssz")" -f
--show "$img1")
-udevadm settle
-trap 'losetup -d "$loop"' INT TERM EXIT
-mount -o subvol=factory-run -t btrfs "$loop" "$DATADIR/unpacked"
-trap 'umount -d "$DATADIR/unpacked"' INT TERM EXIT
+mkdir -p "$DATADIR/unpacked"
+device=$(loopback_rootfs "$img1")
+mount -o subvol=factory-run "$device" "$DATADIR/unpacked"
+trap 'cd /; loopback_unmount "$device"' INT TERM ERR
cd "$DATADIR/unpacked"
echo "old version:"
@@ -119,7 +105,7 @@ tbdiff-deploy "$patch" 2>/dev/null
echo "new version:"
./bin/hello
-# Done.
echo "Done."
-# chdir out of mounted folder, so it can be unmounted
+
cd /
+loopback_unmount "$device"
diff --git a/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script
b/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script
index ab0186c..99b5b73 100755
--- a/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script
+++ b/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script
@@ -100,4 +100,3 @@ do
exit 1
fi
done
-
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 f996aaa..0560bb6 100755
--- a/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.script
+++ b/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.script
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
#
# A system kind of syslinux-disk should create the disk image, plus a kernel
# file.
@@ -20,6 +20,8 @@
set -eu
+. "$SRCDIR/tests.as-root/lib"
+
# We only support x86 systems with syslinux-disk.
arch=$(uname -m)
case "$arch" in
@@ -90,6 +92,10 @@ git add linux.morph
git commit --quiet -m 'Make the kernel create a dummy zImage'
+
+rootfs=$("$SRCDIR/scripts/test-morph" --find-system-artifact \
+ build-morphology test:morphs-repo custom system)
+
"$SRCDIR/scripts/test-morph" \
build-morphology test:morphs-repo custom system > /dev/null
@@ -103,3 +109,12 @@ do
fi
done
+mkdir -p "$DATADIR/mnt"
+device=$(loopback_rootfs "$rootfs")
+mount "$device" "$DATADIR/mnt"
+trap 'cd /; loopback_unmount "$device"' INT TERM ERR
+
+cd "$DATADIR/mnt"
+find | LC_ALL=C sort -u
+cd "$DATADIR"
+loopback_unmount "$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
new file mode 100644
index 0000000..1b64387
--- /dev/null
+++ b/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.stdout
@@ -0,0 +1,33 @@
+.
+./boot
+./boot/System.map
+./boot/vmlinuz
+./extlinux.conf
+./factory
+./factory-run
+./factory-run/baserock
+./factory-run/baserock/hello.meta
+./factory-run/baserock/linux.meta
+./factory-run/baserock/stratum.meta
+./factory-run/baserock/system-rootfs.meta
+./factory-run/bin
+./factory-run/bin/hello
+./factory-run/boot
+./factory-run/boot/System.map
+./factory-run/boot/vmlinuz
+./factory-run/etc
+./factory-run/etc/fstab
+./factory-run/extlinux.conf
+./factory/baserock
+./factory/baserock/hello.meta
+./factory/baserock/linux.meta
+./factory/baserock/stratum.meta
+./factory/baserock/system-rootfs.meta
+./factory/bin
+./factory/bin/hello
+./factory/boot
+./factory/boot/System.map
+./factory/boot/vmlinuz
+./factory/etc
+./factory/etc/fstab
+./factory/extlinux.conf
diff --git a/tests.as-root/tarball-image-is-sensible.script
b/tests.as-root/tarball-image-is-sensible.script
index 717d8e3..6e4af67 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
diff --git a/tests.as-root/tarball-image-is-sensible.stdout
b/tests.as-root/tarball-image-is-sensible.stdout
index 34eb675..46a9409 100644
--- a/tests.as-root/tarball-image-is-sensible.stdout
+++ b/tests.as-root/tarball-image-is-sensible.stdout
@@ -1,5 +1,6 @@
./baserock/
./baserock/hello-stratum.meta
+./baserock/hello-tarball-rootfs.meta
./baserock/hello.meta
./baserock/link-stratum.meta
./baserock/links.meta
--
1.7.10.4
1:03 p.m.
On Fri, Oct 26, 2012 at 11:27:34AM +0100, Sam Thursfield wrote:
diff --git a/scripts/test-morph b/scripts/test-morph
index 2b7fb57..fb3e2cd 100755
--- a/scripts/test-morph
+++ b/scripts/test-morph
@@ -27,7 +27,25 @@ set -eu
# distributed builds, which invoke morph as a sub-process.
export PATH="$SRCDIR:$PATH"
-"$SRCDIR/scripts/cmd-filter" "$SRCDIR/morph" --no-default-config \
- --tarball-server= --cache-server= \
- --config="$DATADIR/morph.conf" "$@"
+if [ "$1" = "--find-system-artifact" ]; then
+ shift
+ "$SRCDIR/morph" --no-default-config \
+ --tarball-server= --cache-server= \
+ --config="$DATADIR/morph.conf" --verbose "$@" >
$DATADIR/stdout
+
+ ARTIFACT=$(grep "system \S\+-rootfs is cached at"
"$DATADIR/stdout" | \
+ sed -nre "s/^.*system \S+-rootfs is cached at (\S+)$/\1/p")
+ rm "$DATADIR/stdout"
+
+ if [ ! -e "$ARTIFACT" ]; then
+ echo "Unable to find rootfs artifact: $ARTIFACT" 1>&2
+ exit 1
+ fi
+
+ echo $ARTIFACT
+else
+ "$SRCDIR/scripts/cmd-filter" "$SRCDIR/morph" --no-default-config
\
+ --tarball-server= --cache-server= \
+ --config="$DATADIR/morph.conf" "$@"
+fi
I like this.
diff --git a/tests.as-root/disk-builds-rootfs-and-kernel.script
b/tests.as-root/disk-builds-rootfs-and-kernel.script
index f9748ca..20f4775 100755
--- a/tests.as-root/disk-builds-rootfs-and-kernel.script
+++ b/tests.as-root/disk-builds-rootfs-and-kernel.script
@@ -83,8 +85,8 @@ git add linux.morph
git commit --quiet -m 'Make the kernel create a dummy zImage'
-"$SRCDIR/scripts/test-morph" \
- build-morphology test:morphs-repo custom system > /dev/null
+rootfs=$("$SRCDIR/scripts/test-morph" --find-system-artifact \
+ build-morphology test:morphs-repo custom system)
I'd have quoted this, but I think bash is smart enough not to need it
here.
diff --git a/tests.as-root/lib b/tests.as-root/lib
new file mode 100644
index 0000000..de7ba70
--- /dev/null
+++ b/tests.as-root/lib
@@ -0,0 +1,48 @@
snip
+loopback_rootfs() {
+ # Find offset partition offset in a rootfs and mount it
+ ROOTFS="$1"
+
+ mv $ROOTFS $ROOTFS-unzipped.gz
+ gunzip $ROOTFS-unzipped.gz
+
+ OFFSET=$(sfdisk -d $ROOTFS-unzipped | \
+ grep -m 1 -o 'start=\s\+\([0-9]\+\)' | awk '{ print $2 }')
+ OFFSET=$(expr $OFFSET '*' 512)
+
+ DEVICE=$(losetup --show -o "$OFFSET" -f "$ROOTFS-unzipped")
+ udevadm settle
+
+ echo $DEVICE
+}
Variable should be quoted here, but if there's no other issues I'll do
that in the merge.
+loopback_unmount() {
+ # BusyBox and GNU umount have opposite behaviour with regards to
+ # deleting the loopback device automatically, and there is no easy
+ # way to reconcile them.
+ DEVICE="$1"
+
+ umount "$DEVICE"
+
+ if losetup -a | grep -q "$DEVICE" ; then
+ losetup -d "$DEVICE"
+ fi
+}
I think umount -d may suffice here, since busybox ignores it and util-linux
behaves like busybox if -d is specified.
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 f996aaa..0560bb6 100755
--- a/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.script
+++ b/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.script
@@ -90,6 +92,10 @@ git add linux.morph
git commit --quiet -m 'Make the kernel create a dummy zImage'
+
+rootfs=$("$SRCDIR/scripts/test-morph" --find-system-artifact \
+ build-morphology test:morphs-repo custom system)
+
"$SRCDIR/scripts/test-morph" \
build-morphology test:morphs-repo custom system > /dev/null
Is this right? It looks like it's running morph twice.
diff --git a/tests.as-root/tarball-image-is-sensible.script
b/tests.as-root/tarball-image-is-sensible.script
index 717d8e3..6e4af67 100755
--- a/tests.as-root/tarball-image-is-sensible.script
+++ b/tests.as-root/tarball-image-is-sensible.script
@@ -26,14 +26,11 @@ esac
snip
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
Why was this change made?
2:25 p.m.
On 10/26/2012 12:03 PM, Richard Maw wrote:
On Fri, Oct 26, 2012 at 11:27:34AM +0100, Sam Thursfield wrote:
> diff --git a/scripts/test-morph b/scripts/test-morph
> index 2b7fb57..fb3e2cd 100755
> --- a/scripts/test-morph
> +++ b/scripts/test-morph
> @@ -27,7 +27,25 @@ set -eu
> # distributed builds, which invoke morph as a sub-process.
> export PATH="$SRCDIR:$PATH"
>
> -"$SRCDIR/scripts/cmd-filter" "$SRCDIR/morph" --no-default-config
\
> - --tarball-server= --cache-server= \
> - --config="$DATADIR/morph.conf" "$@"
> +if [ "$1" = "--find-system-artifact" ]; then
> + shift
>
> + "$SRCDIR/morph" --no-default-config \
> + --tarball-server= --cache-server= \
> + --config="$DATADIR/morph.conf" --verbose "$@" >
$DATADIR/stdout
> +
> + ARTIFACT=$(grep "system \S\+-rootfs is cached at"
"$DATADIR/stdout" | \
> + sed -nre "s/^.*system \S+-rootfs is cached at (\S+)$/\1/p")
> + rm "$DATADIR/stdout"
> +
> + if [ ! -e "$ARTIFACT" ]; then
> + echo "Unable to find rootfs artifact: $ARTIFACT" 1>&2
> + exit 1
> + fi
> +
> + echo $ARTIFACT
> +else
> + "$SRCDIR/scripts/cmd-filter" "$SRCDIR/morph"
--no-default-config \
> + --tarball-server= --cache-server= \
> + --config="$DATADIR/morph.conf" "$@"
> +fi
I like this.
> diff --git a/tests.as-root/disk-builds-rootfs-and-kernel.script
b/tests.as-root/disk-builds-rootfs-and-kernel.script
> index f9748ca..20f4775 100755
> --- a/tests.as-root/disk-builds-rootfs-and-kernel.script
> +++ b/tests.as-root/disk-builds-rootfs-and-kernel.script
> @@ -83,8 +85,8 @@ git add linux.morph
>
> git commit --quiet -m 'Make the kernel create a dummy zImage'
>
> -"$SRCDIR/scripts/test-morph" \
> - build-morphology test:morphs-repo custom system > /dev/null
> +rootfs=$("$SRCDIR/scripts/test-morph" --find-system-artifact \
> + build-morphology test:morphs-repo custom system)
I'd have quoted this, but I think bash is smart enough not to need it
here.
> diff --git a/tests.as-root/lib b/tests.as-root/lib
> new file mode 100644
> index 0000000..de7ba70
> --- /dev/null
> +++ b/tests.as-root/lib
> @@ -0,0 +1,48 @@
snip
> +loopback_rootfs() {
> + # Find offset partition offset in a rootfs and mount it
> + ROOTFS="$1"
> +
> + mv $ROOTFS $ROOTFS-unzipped.gz
> + gunzip $ROOTFS-unzipped.gz
> +
> + OFFSET=$(sfdisk -d $ROOTFS-unzipped | \
> + grep -m 1 -o 'start=\s\+\([0-9]\+\)' | awk '{ print $2 }')
> + OFFSET=$(expr $OFFSET '*' 512)
> +
> + DEVICE=$(losetup --show -o "$OFFSET" -f "$ROOTFS-unzipped")
> + udevadm settle
> +
> + echo $DEVICE
> +}
Variable should be quoted here, but if there's no other issues I'll do
that in the merge.
> +loopback_unmount() {
> + # BusyBox and GNU umount have opposite behaviour with regards to
> + # deleting the loopback device automatically, and there is no easy
> + # way to reconcile them.
> + DEVICE="$1"
> +
> + umount "$DEVICE"
> +
> + if losetup -a | grep -q "$DEVICE" ; then
> + losetup -d "$DEVICE"
> + fi
> +}
I think umount -d may suffice here, since busybox ignores it and util-linux
behaves like busybox if -d is specified.
OK, I didn't get 'umount -d' to work on BusyBox yesterday, but that must
just have been me being stupid since it works today.
> 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 f996aaa..0560bb6 100755
> --- a/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.script
> +++ b/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.script
> @@ -90,6 +92,10 @@ git add linux.morph
>
> git commit --quiet -m 'Make the kernel create a dummy zImage'
>
> +
> +rootfs=$("$SRCDIR/scripts/test-morph" --find-system-artifact \
> + build-morphology test:morphs-repo custom system)
> +
> "$SRCDIR/scripts/test-morph" \
> build-morphology test:morphs-repo custom system > /dev/null
Is this right? It looks like it's running morph twice.
Also me being stupid
> diff --git a/tests.as-root/tarball-image-is-sensible.script
b/tests.as-root/tarball-image-is-sensible.script
> index 717d8e3..6e4af67 100755
> --- a/tests.as-root/tarball-image-is-sensible.script
> +++ b/tests.as-root/tarball-image-is-sensible.script
> @@ -26,14 +26,11 @@ esac
snip
> 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
Why was this change made?
I get different results running the tests on Baserock and Fedora
otherwise. The sort order of the file is different, despite us having
set LC_ALL=C ... I can't work out why, but this change made them both
behave the same.
I'll do another new patch with the further corrections.
Sam
2:39 p.m.
On Fri, Oct 26, 2012 at 01:25:15PM +0100, Sam Thursfield wrote:
On 10/26/2012 12:03 PM, Richard Maw wrote:
>On Fri, Oct 26, 2012 at 11:27:34AM +0100, Sam Thursfield wrote:
>>diff --git a/tests.as-root/tarball-image-is-sensible.script
b/tests.as-root/tarball-image-is-sensible.script
>>index 717d8e3..6e4af67 100755
>>--- a/tests.as-root/tarball-image-is-sensible.script
>>+++ b/tests.as-root/tarball-image-is-sensible.script
>>@@ -26,14 +26,11 @@ esac
>snip
>> 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
>
>Why was this change made?
I get different results running the tests on Baserock and Fedora
otherwise. The sort order of the file is different, despite us
having set LC_ALL=C ... I can't work out why, but this change made
them both
behave the same.
That's unexpected, since it would imply either xargs or ls is throwing
away the order of its arguments. The fix is good though.
3:02 p.m.
On Fri, Oct 26, 2012 at 01:39:15PM +0100, Richard Maw wrote:
That's unexpected, since it would imply either xargs or ls is
throwing
away the order of its arguments. The fix is good though.
ls sorts is arguments:
liw@mavolio$ touch a b c d
liw@mavolio$ ls b c d a
a b c d
liw@mavolio$
--
http://www.codethink.co.uk/
2:46 p.m.
New subject: [PATCH] V3: Write metadata for the rootfs itself into the rootfs
Repository: git://git.baserock.org/baserock/morph
Branch: samthursfield/write-metadata-for-system
Sha1: c67afe0431f4abfc16eb9994239c3f21b56ad303
Use 'umount -d' instead of my complex hack - tested on Baserock and
Fedora and it works fine.
Fixed double invocation of Morph
Sam Thursfield (1):
Write metadata for the rootfs itself into the rootfs
morphlib/builder2.py | 5 +--
morphlib/plugins/tarball-systembuilder_plugin.py | 1 +
scripts/test-morph | 24 ++++++++++++--
tests.as-root/disk-builds-rootfs-and-kernel.script | 17 ++++++++--
tests.as-root/disk-builds-rootfs-and-kernel.stdout | 30 +++++++++++++++++
tests.as-root/lib | 35 ++++++++++++++++++++
tests.as-root/make-patch.script | 32 +++++-------------
.../rootfs-tarball-builds-rootfs-and-kernel.script | 1 -
.../syslinux-disk-builds-rootfs-and-kernel.script | 18 ++++++++--
.../syslinux-disk-builds-rootfs-and-kernel.stdout | 33 ++++++++++++++++++
tests.as-root/tarball-image-is-sensible.script | 9 ++---
tests.as-root/tarball-image-is-sensible.stdout | 1 +
12 files changed, 165 insertions(+), 41 deletions(-)
create mode 100644 tests.as-root/disk-builds-rootfs-and-kernel.stdout
create mode 100644 tests.as-root/lib
create mode 100644 tests.as-root/syslinux-disk-builds-rootfs-and-kernel.stdout
--
1.7.10.4
2:46 p.m.
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
---
morphlib/builder2.py | 5 +--
morphlib/plugins/tarball-systembuilder_plugin.py | 1 +
scripts/test-morph | 24 ++++++++++++--
tests.as-root/disk-builds-rootfs-and-kernel.script | 17 ++++++++--
tests.as-root/disk-builds-rootfs-and-kernel.stdout | 30 +++++++++++++++++
tests.as-root/lib | 35 ++++++++++++++++++++
tests.as-root/make-patch.script | 32 +++++-------------
.../rootfs-tarball-builds-rootfs-and-kernel.script | 1 -
.../syslinux-disk-builds-rootfs-and-kernel.script | 18 ++++++++--
.../syslinux-disk-builds-rootfs-and-kernel.stdout | 33 ++++++++++++++++++
tests.as-root/tarball-image-is-sensible.script | 9 ++---
tests.as-root/tarball-image-is-sensible.stdout | 1 +
12 files changed, 165 insertions(+), 41 deletions(-)
create mode 100644 tests.as-root/disk-builds-rootfs-and-kernel.stdout
create mode 100644 tests.as-root/lib
create mode 100644 tests.as-root/syslinux-disk-builds-rootfs-and-kernel.stdout
diff --git a/morphlib/builder2.py b/morphlib/builder2.py
index 565fdf4..d376805 100644
--- a/morphlib/builder2.py
+++ b/morphlib/builder2.py
@@ -662,8 +662,8 @@ class DiskImageBuilder(SystemKindBuilder): # pragma: no cover
with self.build_watch('overall-build'):
arch = self.artifact.source.morphology['arch']
- rootfs_artifact = self.new_artifact(
- self.artifact.source.morphology['name'] + '-rootfs')
+ rootfs_name = self.artifact.source.morphology['name'] +
'-rootfs'
+ rootfs_artifact = self.new_artifact(rootfs_name)
handle = self.local_artifact_cache.put(rootfs_artifact)
(image_file_fd, image_name) = \
tempfile.mkstemp(dir=self.app.settings['tempdir'])
@@ -682,6 +682,7 @@ class DiskImageBuilder(SystemKindBuilder): # pragma: no cover
factory_path = os.path.join(mount_point, 'factory')
self._create_subvolume(factory_path)
self.unpack_strata(factory_path)
+ self.write_metadata(factory_path, rootfs_name)
self.create_fstab(factory_path)
self._create_bootloader_config(factory_path)
self._create_subvolume_snapshot(
diff --git a/morphlib/plugins/tarball-systembuilder_plugin.py
b/morphlib/plugins/tarball-systembuilder_plugin.py
index 95cae4c..1480792 100644
--- a/morphlib/plugins/tarball-systembuilder_plugin.py
+++ b/morphlib/plugins/tarball-systembuilder_plugin.py
@@ -49,6 +49,7 @@ class RootfsTarballBuilder(SystemKindBuilder): # pragma: no cover
try:
fs_root = self.staging_area.destdir(self.artifact.source)
self.unpack_strata(fs_root)
+ self.write_metadata(fs_root, rootfs_name)
self.create_fstab(fs_root)
self.copy_kernel_into_artifact_cache(fs_root)
unslashy_root = fs_root[1:]
diff --git a/scripts/test-morph b/scripts/test-morph
index 2b7fb57..fb3e2cd 100755
--- a/scripts/test-morph
+++ b/scripts/test-morph
@@ -27,7 +27,25 @@ set -eu
# distributed builds, which invoke morph as a sub-process.
export PATH="$SRCDIR:$PATH"
-"$SRCDIR/scripts/cmd-filter" "$SRCDIR/morph" --no-default-config \
- --tarball-server= --cache-server= \
- --config="$DATADIR/morph.conf" "$@"
+if [ "$1" = "--find-system-artifact" ]; then
+ shift
+ "$SRCDIR/morph" --no-default-config \
+ --tarball-server= --cache-server= \
+ --config="$DATADIR/morph.conf" --verbose "$@" >
$DATADIR/stdout
+
+ ARTIFACT=$(grep "system \S\+-rootfs is cached at"
"$DATADIR/stdout" | \
+ sed -nre "s/^.*system \S+-rootfs is cached at (\S+)$/\1/p")
+ rm "$DATADIR/stdout"
+
+ if [ ! -e "$ARTIFACT" ]; then
+ echo "Unable to find rootfs artifact: $ARTIFACT" 1>&2
+ exit 1
+ fi
+
+ echo $ARTIFACT
+else
+ "$SRCDIR/scripts/cmd-filter" "$SRCDIR/morph" --no-default-config
\
+ --tarball-server= --cache-server= \
+ --config="$DATADIR/morph.conf" "$@"
+fi
diff --git a/tests.as-root/disk-builds-rootfs-and-kernel.script
b/tests.as-root/disk-builds-rootfs-and-kernel.script
index f9748ca..3b9174c 100755
--- a/tests.as-root/disk-builds-rootfs-and-kernel.script
+++ b/tests.as-root/disk-builds-rootfs-and-kernel.script
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
#
# A system kind of 'disk' should create the disk image, plus a kernel file.
#
@@ -19,6 +19,8 @@
set -eu
+. "$SRCDIR/tests.as-root/lib"
+
cache="$DATADIR/cache/artifacts"
kernelrepo="$DATADIR/kernel-repo"
morphsrepo="$DATADIR/morphs-repo"
@@ -83,8 +85,8 @@ git add linux.morph
git commit --quiet -m 'Make the kernel create a dummy zImage'
-"$SRCDIR/scripts/test-morph" \
- build-morphology test:morphs-repo custom system > /dev/null
+rootfs=$("$SRCDIR/scripts/test-morph" --find-system-artifact \
+ build-morphology test:morphs-repo custom system)
for suffix in kernel rootfs
do
@@ -96,3 +98,12 @@ do
fi
done
+mkdir -p "$DATADIR/mnt"
+device=$(loopback_rootfs "$rootfs")
+mount "$device" "$DATADIR/mnt"
+trap 'cd /; umount -d "$device"' INT TERM ERR
+
+cd "$DATADIR/mnt"
+find | LC_ALL=C sort -u
+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
new file mode 100644
index 0000000..929f284
--- /dev/null
+++ b/tests.as-root/disk-builds-rootfs-and-kernel.stdout
@@ -0,0 +1,30 @@
+.
+./boot
+./boot/System.map
+./boot/vmlinuz
+./factory
+./factory-run
+./factory-run/baserock
+./factory-run/baserock/hello.meta
+./factory-run/baserock/linux.meta
+./factory-run/baserock/stratum.meta
+./factory-run/baserock/system-rootfs.meta
+./factory-run/bin
+./factory-run/bin/hello
+./factory-run/boot
+./factory-run/boot/System.map
+./factory-run/boot/vmlinuz
+./factory-run/etc
+./factory-run/etc/fstab
+./factory/baserock
+./factory/baserock/hello.meta
+./factory/baserock/linux.meta
+./factory/baserock/stratum.meta
+./factory/baserock/system-rootfs.meta
+./factory/bin
+./factory/bin/hello
+./factory/boot
+./factory/boot/System.map
+./factory/boot/vmlinuz
+./factory/etc
+./factory/etc/fstab
diff --git a/tests.as-root/lib b/tests.as-root/lib
new file mode 100644
index 0000000..ec5e52f
--- /dev/null
+++ b/tests.as-root/lib
@@ -0,0 +1,35 @@
+#!/bin/sh
+#
+# Copyright (C) 2012 Codethink Limited
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+# Helper functions for as-root tests
+
+loopback_rootfs() {
+ # Find offset partition offset in a rootfs and mount it
+ ROOTFS="$1"
+
+ mv $ROOTFS $ROOTFS-unzipped.gz
+ gunzip $ROOTFS-unzipped.gz
+
+ OFFSET=$(sfdisk -d $ROOTFS-unzipped | \
+ grep -m 1 -o 'start=\s\+\([0-9]\+\)' | awk '{ print $2 }')
+ OFFSET=$(expr $OFFSET '*' 512)
+
+ DEVICE=$(losetup --show -o "$OFFSET" -f "$ROOTFS-unzipped")
+ udevadm settle
+
+ echo $DEVICE
+}
diff --git a/tests.as-root/make-patch.script b/tests.as-root/make-patch.script
index 031ecb6..7f033c2 100755
--- a/tests.as-root/make-patch.script
+++ b/tests.as-root/make-patch.script
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
#
# Test making a patch between two different system images
#
@@ -19,6 +19,8 @@
set -eu
+. "$SRCDIR/tests.as-root/lib"
+
# Make a stratum that include hello and kernel chunks.
cat <<EOF > "$DATADIR/morphs-repo/hello-stratum.morph"
{
@@ -89,26 +91,10 @@ Done.
EOF
exit 0
-# find out the offset of the partition in the disk image
-# udevadm settle is used to wait until devices have appeared
-loop=$(losetup -f --show "$img1")
-udevadm settle
-offset=$(sfdisk -d "$loop" |
- sed -n '/start=/s/^.*start=\s*\([0-9]\+\)[^0-9].*$/\1/p' |
- head -n 1)
-ssz=`cat "/sys/devices/virtual/block/$(basename
"$loop")/queue/hw_sector_size"`
-losetup -d "$loop"
-udevadm settle
-
-# mount the disk
-mkdir "$DATADIR/unpacked"
-# this has to be done by losetup then mount, because busybox mount doesn't
-# accept the -o offset= option
-loop=$(losetup -o "$(expr "$offset" '*' "$ssz")" -f
--show "$img1")
-udevadm settle
-trap 'losetup -d "$loop"' INT TERM EXIT
-mount -o subvol=factory-run -t btrfs "$loop" "$DATADIR/unpacked"
-trap 'umount -d "$DATADIR/unpacked"' INT TERM EXIT
+mkdir -p "$DATADIR/unpacked"
+device=$(loopback_rootfs "$img1")
+mount -o subvol=factory-run "$device" "$DATADIR/unpacked"
+trap 'cd /; umount -d "$device"' INT TERM ERR
cd "$DATADIR/unpacked"
echo "old version:"
@@ -119,7 +105,7 @@ tbdiff-deploy "$patch" 2>/dev/null
echo "new version:"
./bin/hello
-# Done.
echo "Done."
-# chdir out of mounted folder, so it can be unmounted
+
cd /
+umount -d "$device"
diff --git a/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script
b/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script
index ab0186c..99b5b73 100755
--- a/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script
+++ b/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script
@@ -100,4 +100,3 @@ do
exit 1
fi
done
-
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 f996aaa..746ca3c 100755
--- a/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.script
+++ b/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.script
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
#
# A system kind of syslinux-disk should create the disk image, plus a kernel
# file.
@@ -20,6 +20,8 @@
set -eu
+. "$SRCDIR/tests.as-root/lib"
+
# We only support x86 systems with syslinux-disk.
arch=$(uname -m)
case "$arch" in
@@ -90,8 +92,9 @@ git add linux.morph
git commit --quiet -m 'Make the kernel create a dummy zImage'
-"$SRCDIR/scripts/test-morph" \
- build-morphology test:morphs-repo custom system > /dev/null
+
+rootfs=$("$SRCDIR/scripts/test-morph" --find-system-artifact \
+ build-morphology test:morphs-repo custom system)
for suffix in kernel rootfs
do
@@ -103,3 +106,12 @@ do
fi
done
+mkdir -p "$DATADIR/mnt"
+device=$(loopback_rootfs "$rootfs")
+mount "$device" "$DATADIR/mnt"
+trap 'cd /; umount -d "$device"' INT TERM ERR
+
+cd "$DATADIR/mnt"
+find | LC_ALL=C sort -u
+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
new file mode 100644
index 0000000..1b64387
--- /dev/null
+++ b/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.stdout
@@ -0,0 +1,33 @@
+.
+./boot
+./boot/System.map
+./boot/vmlinuz
+./extlinux.conf
+./factory
+./factory-run
+./factory-run/baserock
+./factory-run/baserock/hello.meta
+./factory-run/baserock/linux.meta
+./factory-run/baserock/stratum.meta
+./factory-run/baserock/system-rootfs.meta
+./factory-run/bin
+./factory-run/bin/hello
+./factory-run/boot
+./factory-run/boot/System.map
+./factory-run/boot/vmlinuz
+./factory-run/etc
+./factory-run/etc/fstab
+./factory-run/extlinux.conf
+./factory/baserock
+./factory/baserock/hello.meta
+./factory/baserock/linux.meta
+./factory/baserock/stratum.meta
+./factory/baserock/system-rootfs.meta
+./factory/bin
+./factory/bin/hello
+./factory/boot
+./factory/boot/System.map
+./factory/boot/vmlinuz
+./factory/etc
+./factory/etc/fstab
+./factory/extlinux.conf
diff --git a/tests.as-root/tarball-image-is-sensible.script
b/tests.as-root/tarball-image-is-sensible.script
index 717d8e3..6e4af67 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
diff --git a/tests.as-root/tarball-image-is-sensible.stdout
b/tests.as-root/tarball-image-is-sensible.stdout
index 34eb675..46a9409 100644
--- a/tests.as-root/tarball-image-is-sensible.stdout
+++ b/tests.as-root/tarball-image-is-sensible.stdout
@@ -1,5 +1,6 @@
./baserock/
./baserock/hello-stratum.meta
+./baserock/hello-tarball-rootfs.meta
./baserock/hello.meta
./baserock/link-stratum.meta
./baserock/links.meta
--
1.7.10.4
3:51 p.m.
New subject: [PATCH] V3: Write metadata for the rootfs itself into the rootfs
On Fri, Oct 26, 2012 at 01:46:07PM +0100, Sam Thursfield wrote:
Repository: git://git.baserock.org/baserock/morph
Branch: samthursfield/write-metadata-for-system
Sha1: c67afe0431f4abfc16eb9994239c3f21b56ad303
Merged and pushed, with a fix to your shell quoting in
tests.as-root/lib.
I'm annoyed by the fact that I have to run ./check in a different
TMPDIR, due to the size of system images, I may do a sparse gunzip
later.
4054
days inactive
4055
days old
20 comments
4 participants
participants (4)
-
Daniel Silverstone -
Lars Wirzenius -
Richard Maw -
Sam Thursfield