| Message ID | 20200615072055.2083-6-nolange79@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2,01/14] package/systemd: configure nss plugins in nsswitch.conf | expand |
Norbert, All, On 2020-06-15 09:20 +0200, Norbert Lange spake thusly: > The necessary system users are documented in the projects README. > > Description is matched to the ones in the upstream sysusers.d > files. Remove homedirectory (upstream doesnt care either). > > Signed-off-by: Norbert Lange <nolange79@gmail.com> Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/systemd/systemd.mk | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > index 6629c933cd..2cc71ee667 100644 > --- a/package/systemd/systemd.mk > +++ b/package/systemd/systemd.mk > @@ -214,7 +214,7 @@ endif > > ifeq ($(BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE),y) > SYSTEMD_CONF_OPTS += -Dremote=true > -SYSTEMD_REMOTE_USER = systemd-journal-remote -1 systemd-journal-remote -1 * /var/log/journal/remote - - Journal Remote > +SYSTEMD_REMOTE_USER = systemd-journal-remote -1 systemd-journal-remote -1 * - - - systemd Journal Remote > else > SYSTEMD_CONF_OPTS += -Dremote=false > endif > @@ -358,7 +358,7 @@ endif > > ifeq ($(BR2_PACKAGE_SYSTEMD_COREDUMP),y) > SYSTEMD_CONF_OPTS += -Dcoredump=true > -SYSTEMD_COREDUMP_USER = systemd-coredump -1 systemd-coredump -1 * /var/lib/systemd/coredump - - Core Dumper > +SYSTEMD_COREDUMP_USER = systemd-coredump -1 systemd-coredump -1 * - - - systemd core dump processing > else > SYSTEMD_CONF_OPTS += -Dcoredump=false > endif > @@ -378,7 +378,7 @@ endif > > ifeq ($(BR2_PACKAGE_SYSTEMD_NETWORKD),y) > SYSTEMD_CONF_OPTS += -Dnetworkd=true > -SYSTEMD_NETWORKD_USER = systemd-network -1 systemd-network -1 * - - - Network Manager > +SYSTEMD_NETWORKD_USER = systemd-network -1 systemd-network -1 * - - - systemd Network Management > SYSTEMD_NETWORKD_DHCP_IFACE = $(call qstrip,$(BR2_SYSTEM_DHCP)) > ifneq ($(SYSTEMD_NETWORKD_DHCP_IFACE),) > define SYSTEMD_INSTALL_NETWORK_CONFS > @@ -397,7 +397,7 @@ define SYSTEMD_INSTALL_RESOLVCONF_HOOK > $(TARGET_DIR)/etc/resolv.conf > endef > SYSTEMD_CONF_OPTS += -Dnss-resolve=true -Dresolve=true > -SYSTEMD_RESOLVED_USER = systemd-resolve -1 systemd-resolve -1 * - - - Network Name Resolution Manager > +SYSTEMD_RESOLVED_USER = systemd-resolve -1 systemd-resolve -1 * - - - systemd Resolver > else > SYSTEMD_CONF_OPTS += -Dnss-resolve=false -Dresolve=false > endif > @@ -414,7 +414,7 @@ endif > > ifeq ($(BR2_PACKAGE_SYSTEMD_TIMESYNCD),y) > SYSTEMD_CONF_OPTS += -Dtimesyncd=true > -SYSTEMD_TIMESYNCD_USER = systemd-timesync -1 systemd-timesync -1 * - - - Network Time Synchronization > +SYSTEMD_TIMESYNCD_USER = systemd-timesync -1 systemd-timesync -1 * - - - systemd Time Synchronization > else > SYSTEMD_CONF_OPTS += -Dtimesyncd=false > endif > -- > 2.27.0 >
diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 6629c933cd..2cc71ee667 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -214,7 +214,7 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE),y) SYSTEMD_CONF_OPTS += -Dremote=true -SYSTEMD_REMOTE_USER = systemd-journal-remote -1 systemd-journal-remote -1 * /var/log/journal/remote - - Journal Remote +SYSTEMD_REMOTE_USER = systemd-journal-remote -1 systemd-journal-remote -1 * - - - systemd Journal Remote else SYSTEMD_CONF_OPTS += -Dremote=false endif @@ -358,7 +358,7 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_COREDUMP),y) SYSTEMD_CONF_OPTS += -Dcoredump=true -SYSTEMD_COREDUMP_USER = systemd-coredump -1 systemd-coredump -1 * /var/lib/systemd/coredump - - Core Dumper +SYSTEMD_COREDUMP_USER = systemd-coredump -1 systemd-coredump -1 * - - - systemd core dump processing else SYSTEMD_CONF_OPTS += -Dcoredump=false endif @@ -378,7 +378,7 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_NETWORKD),y) SYSTEMD_CONF_OPTS += -Dnetworkd=true -SYSTEMD_NETWORKD_USER = systemd-network -1 systemd-network -1 * - - - Network Manager +SYSTEMD_NETWORKD_USER = systemd-network -1 systemd-network -1 * - - - systemd Network Management SYSTEMD_NETWORKD_DHCP_IFACE = $(call qstrip,$(BR2_SYSTEM_DHCP)) ifneq ($(SYSTEMD_NETWORKD_DHCP_IFACE),) define SYSTEMD_INSTALL_NETWORK_CONFS @@ -397,7 +397,7 @@ define SYSTEMD_INSTALL_RESOLVCONF_HOOK $(TARGET_DIR)/etc/resolv.conf endef SYSTEMD_CONF_OPTS += -Dnss-resolve=true -Dresolve=true -SYSTEMD_RESOLVED_USER = systemd-resolve -1 systemd-resolve -1 * - - - Network Name Resolution Manager +SYSTEMD_RESOLVED_USER = systemd-resolve -1 systemd-resolve -1 * - - - systemd Resolver else SYSTEMD_CONF_OPTS += -Dnss-resolve=false -Dresolve=false endif @@ -414,7 +414,7 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_TIMESYNCD),y) SYSTEMD_CONF_OPTS += -Dtimesyncd=true -SYSTEMD_TIMESYNCD_USER = systemd-timesync -1 systemd-timesync -1 * - - - Network Time Synchronization +SYSTEMD_TIMESYNCD_USER = systemd-timesync -1 systemd-timesync -1 * - - - systemd Time Synchronization else SYSTEMD_CONF_OPTS += -Dtimesyncd=false endif
The necessary system users are documented in the projects README. Description is matched to the ones in the upstream sysusers.d files. Remove homedirectory (upstream doesnt care either). Signed-off-by: Norbert Lange <nolange79@gmail.com> --- package/systemd/systemd.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)