diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-02-12 17:09:00 +0000 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-02-12 17:09:00 +0000 |
| commit | 005410e90332a13da3df19f7be37ede0d77a321f (patch) | |
| tree | 4ed7343b7d4d8a092c198393ccade73e1d874823 | |
| parent | 3f099cb75c1d104e68a780d5b3435204a6fd7584 (diff) | |
| parent | 3cddd54683bd2087212f310f172aca046c7b6ccd (diff) | |
| download | definitions-005410e90332a13da3df19f7be37ede0d77a321f.tar.gz | |
Merge branch 'baserock/pedroalvarez/systemd-v218'
Reviewed-by: Javier Jardon <jjardon@gnome.org>
Reviewed-by: Sam Thursfield <sam.thursfield@codethink.co.uk>
| -rw-r--r-- | strata/foundation.morph | 4 | ||||
| -rw-r--r-- | strata/foundation/systemd.morph~ | 28 | ||||
| -rw-r--r-- | strata/trove.morph | 2 |
3 files changed, 31 insertions, 3 deletions
diff --git a/strata/foundation.morph b/strata/foundation.morph index 23398639..533ac9ee 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -82,8 +82,8 @@ chunks: - name: systemd morph: strata/foundation/systemd.morph repo: upstream:systemd - ref: 941a643569dc6b53d0b334276d2a3cc0ed159e88 - unpetrify-ref: v217 + ref: df0082ede6d0ca4db6773747eaf1c36d97458744 + unpetrify-ref: baserock/v218-with-canonical-hostname-fix build-depends: - dbus-pre - gobject-introspection diff --git a/strata/foundation/systemd.morph~ b/strata/foundation/systemd.morph~ new file mode 100644 index 00000000..1ee23cb8 --- /dev/null +++ b/strata/foundation/systemd.morph~ @@ -0,0 +1,28 @@ +name: systemd +kind: chunk +max-jobs: 1 +build-system: autotools +configure-commands: +- sh autogen.sh +- ./configure --prefix="$PREFIX" --enable-xz --disable-manpages --sysconfdir=/etc + --localstatedir=/var --libdir="$PREFIX/lib" --libexecdir="$PREFIX/libexec" --with-rootprefix= + --with-rootlibdir=/lib +install-commands: +- make DESTDIR="$DESTDIR" install +- mkdir -p "$DESTDIR"/sbin +- ln -s /lib/systemd/systemd "$DESTDIR"/sbin/init +- for f in telinit runlevel shutdown poweroff reboot halt; do ln -s /bin/systemctl + "$DESTDIR/sbin/$f"; done +- sed -e 's|@sushell@|/bin/sh|g' units/debug-shell.service.in >"$DESTDIR/etc/systemd/system/debug-shell.service" +- sed -r -e '/Options=/s/,?strictatime//' "$DESTDIR/lib/systemd/system/tmp.mount" + >"$DESTDIR/etc/systemd/system/tmp.mount" +- touch "$DESTDIR/etc/machine-id" +post-install-commands: +- | + cat > "$DESTDIR/etc/systemd/network/10-dhcp.network" << "EOF" + [Match] + Name=en* + + [Network] + DHCP=yes + EOF diff --git a/strata/trove.morph b/strata/trove.morph index b71a79c2..fcd34636 100644 --- a/strata/trove.morph +++ b/strata/trove.morph @@ -73,7 +73,7 @@ chunks: - name: trove-setup morph: strata/trove/trove-setup.morph repo: baserock:baserock/trove-setup - ref: 7134fb36f7a1c62111d2eaea5c5b32cf2169cec6 + ref: 1b89b00ccfed5adf796c2a5180a8cf6b2e2badf2 unpetrify-ref: master build-depends: [] - name: lorry-controller |