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.

diff --git a/Makefile.am b/Makefile.am
index 733886816cd512a5ae4456105c8981dc3401b386..685066ff48554f8817ca5dfa6f7d415f253c0073 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1772,9 +1772,12 @@ systemd_sysusers_LDADD = \
 rootbin_PROGRAMS += \
        systemd-sysusers
 
 rootbin_PROGRAMS += \
        systemd-sysusers
 

-dist_sysusers_DATA = \
+nodist_sysusers_DATA = \

        sysusers.d/systemd.conf
 
        sysusers.d/systemd.conf
 

+EXTRA_DIST += \
+       sysusers.d/systemd.conf.in
+

 INSTALL_DIRS += \
        $(sysusersdir)
 endif
 INSTALL_DIRS += \
        $(sysusersdir)
 endif


@@ -4934,7 +4937,8 @@ substitutions = \
        '|NTP_SERVERS=$(NTP_SERVERS)|' \
        '|DNS_SERVERS=$(DNS_SERVERS)|' \
        '|systemuidmax=$(SYSTEM_UID_MAX)|' \
        '|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 $@) && \
 
 SED_PROCESS = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \

diff --git a/configure.ac b/configure.ac
index c68c75930d4936398c965094f924dd568a6abca3..e35d86408de5354f66c743cfa77d48eacf3378b8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1050,8 +1050,11 @@ AM_CONDITIONAL(HAVE_SYSV_COMPAT, test "$SYSTEM_SYSV_COMPAT" = "yes")
 AC_ARG_WITH([tty-gid],
         [AS_HELP_STRING([--with-tty-gid=GID],
                 [Specify the numeric GID of the 'tty' group])],
 AC_ARG_WITH([tty-gid],
         [AS_HELP_STRING([--with-tty-gid=GID],
                 [Specify the numeric GID of the 'tty' group])],

-        [AC_DEFINE_UNQUOTED(TTY_GID, [$withval], [GID of the 'tty' group])],
-        [])
+        [TTY_GID="$withval"],
+        [TTY_GID="5"])
+
+AC_DEFINE_UNQUOTED(TTY_GID, [$TTY_GID], [GID of the 'tty' group])
+AC_SUBST(TTY_GID)

 
 AC_ARG_WITH([dbuspolicydir],
         AS_HELP_STRING([--with-dbuspolicydir=DIR], [D-Bus policy directory]),
 
 AC_ARG_WITH([dbuspolicydir],
         AS_HELP_STRING([--with-dbuspolicydir=DIR], [D-Bus policy directory]),


@@ -1234,6 +1237,7 @@ AC_MSG_RESULT([
         Extra start script:      ${RC_LOCAL_SCRIPT_PATH_START}
         Extra stop script:       ${RC_LOCAL_SCRIPT_PATH_STOP}
         Debug shell:             ${SUSHELL} @ ${DEBUGTTY}
         Extra start script:      ${RC_LOCAL_SCRIPT_PATH_START}
         Extra stop script:       ${RC_LOCAL_SCRIPT_PATH_STOP}
         Debug shell:             ${SUSHELL} @ ${DEBUGTTY}

+        TTY GID:                 ${TTY_GID}

         Maximum System UID:      ${SYSTEM_UID_MAX}
         Maximum System GID:      ${SYSTEM_GID_MAX}
 
         Maximum System UID:      ${SYSTEM_UID_MAX}
         Maximum System GID:      ${SYSTEM_GID_MAX}
 

diff --git a/sysusers.d/systemd.conf b/sysusers.d/systemd.conf.in
similarity index 96%
rename from sysusers.d/systemd.conf
rename to sysusers.d/systemd.conf.in
index 76d6a373f1b664f8ecbfb0a76e1f875fc31d4a8d..b34a8071aaff39ed85aa1e1c8d37a15ad096c115 100644 (file)
--- a/sysusers.d/systemd.conf
+++ b/sysusers.d/systemd.conf.in
@@ -20,7 +20,7 @@ g wheel                         -               -
 # Access to certain kernel and userspace facilities
 g kmem                          -               -
 g lock                          -               -
 # Access to certain kernel and userspace facilities
 g kmem                          -               -
 g lock                          -               -

-g tty                           5               -
+g tty                           @TTY_GID@               -

 g utmp                          -               -
 
 # Hardware access groups
 g utmp                          -               -
 
 # Hardware access groups