diff options
-rw-r--r-- | strata/foundation/systemd.morph | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/strata/foundation/systemd.morph b/strata/foundation/systemd.morph index c53cef39..efca734f 100644 --- a/strata/foundation/systemd.morph +++ b/strata/foundation/systemd.morph @@ -1,10 +1,20 @@ name: systemd kind: chunk build-system: autotools +pre-configure-commands: +# systemd prematurely kills the user session. This is a known bug in systemd +# https://bugs.freedesktop.org/show_bug.cgi?id=70593 +- | + cat >> units/user@.service.m4.in <<EOF + KillSignal=SIGCONT + ExecStop=/bin/kill -TERM \$MAINPID + EOF configure-commands: - sh autogen.sh +# KILL added because it picks up /usr/bin/kill, which is not installed on +# all systems - | - ./configure --prefix="$PREFIX" --enable-xz --disable-manpages \ + KILL=/bin/kill ./configure --prefix="$PREFIX" --enable-xz --disable-manpages \ --disable-tests --sysconfdir=/etc --localstatedir=/var \ --libdir="$PREFIX/lib" --libexecdir="$PREFIX/libexec" \ --with-rootprefix= --with-rootlibdir=/lib @@ -27,3 +37,5 @@ post-install-commands: [Network] DHCP=yes EOF +# Use the pam config systemd provides +- cp -a "$DESTDIR/$PREFIX"/share/factory/etc/pam.d/* "$DESTDIR/etc/pam.d" |