From a9c03fbd1dedf27a27fc05e7601b0d3a758f1a9a Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Jul 21 2018 21:25:42 +0000 Subject: [PATCH 1/2] BUILD: Replace also runstatedir in templates It will be used in systemd socket files Merges: https://pagure.io/SSSD/sssd/pull-request/3691 --- diff --git a/Makefile.am b/Makefile.am index 88b397a..9fa42c7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4686,6 +4686,7 @@ edit_cmd = $(SED) \ -e 's|@sbindir[@]|$(sbindir)|g' \ -e 's|@environment_file[@]|$(environment_file)|g' \ -e 's|@localstatedir[@]|$(localstatedir)|g' \ + -e 's|@runstatedir[@]|$(runstatedir)|g' \ -e 's|@logpath[@]|$(logpath)|g' \ -e 's|@libexecdir[@]|$(libexecdir)|g' \ -e 's|@pipepath[@]|$(pipepath)|g' \ From d4c4213af7a11ea50d097e25c6410b58f7138553 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Jul 21 2018 21:25:55 +0000 Subject: [PATCH 2/2] SYSTEMD: Allow to use "/run" in ListenStream /var/run is only symbolic link to /run on some distributions and /run is mounted on tmpfs sh-4.4$ ls -l /var/run lrwxrwxrwx. 1 root root 6 Dec 12 2015 /var/run -> ../run Previously, we used $(localstatedir)/run in ListenStream which does not allow to use "/run" because we still need to store some files in under $(localstatedir) (/var). Autoconf 2.70 will add new configure time option --runstatedir for configuring runstatedir. ATM, we use just fallback implementation where $(runstatedir) is set to $(localstatedir)/run Merges: https://pagure.io/SSSD/sssd/pull-request/3691 --- diff --git a/src/sysv/systemd/sssd-kcm.socket.in b/src/sysv/systemd/sssd-kcm.socket.in index a454a73..8b74284 100644 --- a/src/sysv/systemd/sssd-kcm.socket.in +++ b/src/sysv/systemd/sssd-kcm.socket.in @@ -4,7 +4,7 @@ Documentation=man:sssd-kcm(8) Requires=sssd-secrets.socket [Socket] -ListenStream=@localstatedir@/run/.heim_org.h5l.kcm-socket +ListenStream=@runstatedir@/.heim_org.h5l.kcm-socket [Install] WantedBy=sockets.target diff --git a/src/sysv/systemd/sssd-secrets.socket.in b/src/sysv/systemd/sssd-secrets.socket.in index fb64852..a7c8b0b 100644 --- a/src/sysv/systemd/sssd-secrets.socket.in +++ b/src/sysv/systemd/sssd-secrets.socket.in @@ -3,7 +3,7 @@ Description=SSSD Secrets Service responder socket Documentation=man:sssd-secrets(5) [Socket] -ListenStream=@localstatedir@/run/secrets.socket +ListenStream=@runstatedir@/secrets.socket [Install] WantedBy=sockets.target