From eec6065166aa7439135475eea3fd94a8b1edc3ef Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Thu, 29 Jan 2015 15:16:19 +0000
Subject: Upgrade systemd to v218 to get bug fixes

Trove-setup uses `systemctl enable` and it wasn't working for
template units (in this case the minion services). With this
upgrade we fix the Trove deployments.

Also some users have found some problems with the 'systemd-journald'
service, which starts logging before the system mounts the '/var'
subvolume. This upgrade is supposed to fix that as well.

Systemd v218 had an important bug:

  ~ # ssh localhost
  Connection closed by ::1

Which was dropping this error in the systemd journal:

  Assertion 'canonical' failed at src/nss-myhostname/nss-myhostname.c:204, function fill_in_hostent(). Aborting.

This bug was fixed upstream in the commit 3fdcecc87eb381ef300719e419d5863dd8a64a97
and it's also been included in this upgrade.
---
 strata/foundation/systemd.morph~ | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 strata/foundation/systemd.morph~

(limited to 'strata/foundation')

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
-- 
cgit v1.2.1