diff options
author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2016-05-13 09:51:51 +0000 |
---|---|---|
committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2016-05-13 09:51:51 +0000 |
commit | a1d5011d51f83f6c13916e34a24565435217b885 (patch) | |
tree | 29ddff21d533eaa02b0f10f668981435601801de /strata/foundation/systemd.morph | |
parent | 5a10111c049228302e37d495c1a32588a7cc41f6 (diff) | |
parent | 0e0a329c086d424452eaa0bfa77e573f77e3b930 (diff) | |
download | infrastructure-a1d5011d51f83f6c13916e34a24565435217b885.tar.gz |
Merge remote-tracking branch 'definitions/master'pedro/openssl101t
Change-Id: I3c7b31d2006dafd8b69386cbee41d0d568b348eb
Diffstat (limited to 'strata/foundation/systemd.morph')
-rw-r--r-- | strata/foundation/systemd.morph | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/strata/foundation/systemd.morph b/strata/foundation/systemd.morph index 04a04c62..ae1f6a14 100644 --- a/strata/foundation/systemd.morph +++ b/strata/foundation/systemd.morph @@ -2,25 +2,20 @@ name: systemd kind: chunk build-system: autotools configure-commands: -- sh autogen.sh +- ./autogen.sh # KILL added because it picks up /usr/bin/kill, which is not installed on # all systems -- | - KILL=/bin/kill ./configure --prefix="$PREFIX" --enable-xz --disable-manpages --enable-compat-libs \ - --disable-tests --sysconfdir=/etc --localstatedir=/var \ - --libdir="$PREFIX/lib" --libexecdir="$PREFIX/libexec" \ - --with-rootprefix= --with-rootlibdir=/lib -install-commands: -- make DESTDIR="$DESTDIR" install +- KILL=/bin/kill ./configure --prefix="$PREFIX" --sysconfdir=/etc --localstatedir=/var + --disable-manpages + --disable-tests + --libexecdir="$PREFIX/libexec" + --enable-split-usr +post-install-commands: - 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 +- ln -s "$PREFIX"/lib/systemd/systemd "$DESTDIR"/sbin/init +- for f in telinit runlevel shutdown poweroff reboot halt; do ln -s "$PREFIX"/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] |