diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-06-12 23:22:27 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-06-12 23:22:27 +0200 |
| commit | f8b5d99408e016ecb3d9bcffcee8c65ef6bc26f6 (patch) | |
| tree | e73178a8d73b8f2a6768b5fcbdc64c9f62cfd944 | |
| parent | 7ec9fb4be987164b1622a4de2c6c96c52bd87b35 (diff) | |
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.
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | sysusers.d/systemd.conf.in (renamed from sysusers.d/systemd.conf) | 2 |
3 files changed, 13 insertions, 5 deletions
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 $@) && \ diff --git a/configure.ac b/configure.ac index c68c75930d..e35d86408d 100644 --- 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_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]), @@ -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} + TTY GID: ${TTY_GID} 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 index 76d6a373f1..b34a8071aa 100644 --- 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 - - -g tty 5 - +g tty @TTY_GID@ - g utmp - - # Hardware access groups |