diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-07-02 16:53:32 +0000 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-07-02 16:53:32 +0000 |
| commit | 7efdaa1487bf39867d21fa19634c35e830940ca7 (patch) | |
| tree | eb51c7971d3452aec8e3471d86341a1b5faa808c | |
| parent | 86cdc9be811969b919e24cb0f456703a662e663a (diff) | |
| parent | 945f004cc5bda68d9a847f8dca4970371753c530 (diff) | |
| download | definitions-7efdaa1487bf39867d21fa19634c35e830940ca7.tar.gz | |
Merge commit '945f004cc5bda68d9a847f8dca4970371753c530'
| -rw-r--r-- | morphlib/builder2.py | 10 | ||||
| -rwxr-xr-x | tests.as-root/tarball-image-is-sensible.script | 2 | ||||
| -rw-r--r-- | tests.as-root/tarball-image-is-sensible.stdout | 6 |
3 files changed, 12 insertions, 6 deletions
diff --git a/morphlib/builder2.py b/morphlib/builder2.py index 69ca9e1c..c1f1fe50 100644 --- a/morphlib/builder2.py +++ b/morphlib/builder2.py @@ -635,10 +635,12 @@ class SystemBuilder(BuilderBase): # pragma: no cover if not os.path.exists(dirname): os.makedirs(dirname) with morphlib.savefile.SaveFile(os_release_file, 'w') as f: - f.write('Baserock %s, built from ref %s on %s\n' % - (self.artifact.source.morphology['name'], - self.artifact.source.original_ref, - datetime.date.today())) + f.write('NAME="Baserock"\n') + f.write('ID=baserock\n') + f.write('HOME_URL="http://wiki.baserock.org"\n') + f.write('SUPPORT_URL="http://wiki.baserock.org/mailinglist"\n') + f.write('BUG_REPORT_URL="http://wiki.baserock.org/mailinglist"\n') + os.chmod(os_release_file, 0644) def create_fstab(self, path): 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" |