From f8b5d99408e016ecb3d9bcffcee8c65ef6bc26f6 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 12 Jun 2014 23:22:27 +0200
Subject: sysuser: generate default snippet incorporating TTY_GID properly

When the user specifies --with-tty-gid= then we should honour that and
write it to the snippet, too.
---
 Makefile.am | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index 733886816c..685066ff48 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1772,9 +1772,12 @@ systemd_sysusers_LDADD = \
 rootbin_PROGRAMS += \
 	systemd-sysusers
 
-dist_sysusers_DATA = \
+nodist_sysusers_DATA = \
 	sysusers.d/systemd.conf
 
+EXTRA_DIST += \
+	sysusers.d/systemd.conf.in
+
 INSTALL_DIRS += \
 	$(sysusersdir)
 endif
@@ -4934,7 +4937,8 @@ substitutions = \
        '|NTP_SERVERS=$(NTP_SERVERS)|' \
        '|DNS_SERVERS=$(DNS_SERVERS)|' \
        '|systemuidmax=$(SYSTEM_UID_MAX)|' \
-       '|systemgidmax=$(SYSTEM_GID_MAX)|'
+       '|systemgidmax=$(SYSTEM_GID_MAX)|' \
+       '|TTY_GID=$(TTY_GID)|'
 
 SED_PROCESS = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-- 
cgit v1.2.3-54-g00ecf