8 files changed, 48 insertions, 18 deletions
diff --git a/sysusers.d/systemd-coredump.conf b/sysusers.d/systemd-coredump.conf
new file mode 100644
index 0000000000..bc0816ca5e
--- /dev/null
+++ b/sysusers.d/systemd-coredump.conf
@@ -0,0 +1,8 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+u systemd-coredump  - "systemd Core Dumper"
diff --git a/sysusers.d/systemd-remote.conf.m4 b/sysusers.d/systemd-journal-gatewayd.conf
index 0e9d71cdd0..379be0852e 100644
--- a/sysusers.d/systemd-remote.conf.m4
+++ b/sysusers.d/systemd-journal-gatewayd.conf
@@ -5,10 +5,4 @@
 #  the Free Software Foundation; either version 2.1 of the License, or
 #  (at your option) any later version.
 
-m4_ifdef(`HAVE_MICROHTTPD',
 u systemd-journal-gateway - "systemd Journal Gateway"
-u systemd-journal-remote  - "systemd Journal Remote"
-)m4_dnl
-m4_ifdef(`HAVE_LIBCURL',
-u systemd-journal-upload  - "systemd Journal Upload"
-)m4_dnl
diff --git a/sysusers.d/systemd-journal-remote.conf b/sysusers.d/systemd-journal-remote.conf
new file mode 100644
index 0000000000..ca20c24896
--- /dev/null
+++ b/sysusers.d/systemd-journal-remote.conf
@@ -0,0 +1,8 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+u systemd-journal-remote  - "systemd Journal Remote"
diff --git a/sysusers.d/systemd-journal-upload.conf b/sysusers.d/systemd-journal-upload.conf
new file mode 100644
index 0000000000..927d400279
--- /dev/null
+++ b/sysusers.d/systemd-journal-upload.conf
@@ -0,0 +1,8 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+u systemd-journal-upload  - "systemd Journal Upload"
diff --git a/sysusers.d/systemd-journald.conf b/sysusers.d/systemd-journald.conf
new file mode 100644
index 0000000000..dcb01f606a
--- /dev/null
+++ b/sysusers.d/systemd-journald.conf
@@ -0,0 +1,8 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+g systemd-journal   - -
diff --git a/sysusers.d/systemd-networkd.conf b/sysusers.d/systemd-networkd.conf
new file mode 100644
index 0000000000..208148d6b8
--- /dev/null
+++ b/sysusers.d/systemd-networkd.conf
@@ -0,0 +1,8 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+u systemd-network   - "systemd Network Management"
diff --git a/sysusers.d/systemd-resolved.conf b/sysusers.d/systemd-resolved.conf
new file mode 100644
index 0000000000..5872bf2db7
--- /dev/null
+++ b/sysusers.d/systemd-resolved.conf
@@ -0,0 +1,8 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+u systemd-resolve   - "systemd Resolver"
diff --git a/sysusers.d/systemd.conf.m4 b/sysusers.d/systemd-timesyncd.conf
index af97509c05..4d7af7b3ae 100644
--- a/sysusers.d/systemd.conf.m4
+++ b/sysusers.d/systemd-timesyncd.conf
@@ -5,16 +5,4 @@
 #  the Free Software Foundation; either version 2.1 of the License, or
 #  (at your option) any later version.
 
-g systemd-journal   - -
-m4_ifdef(`ENABLE_NETWORKD',
-u systemd-network   - "systemd Network Management"
-)m4_dnl
-m4_ifdef(`ENABLE_RESOLVED',
-u systemd-resolve   - "systemd Resolver"
-)m4_dnl
-m4_ifdef(`ENABLE_TIMESYNCD',
 u systemd-timesync  - "systemd Time Synchronization"
-)m4_dnl
-m4_ifdef(`ENABLE_COREDUMP',
-u systemd-coredump  - "systemd Core Dumper"
-)m4_dnl