I want tmpfiles m4 changes to trigger a conflict

11 files changed, 71 insertions, 59 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
diff --git a/tmpfiles.d/etc.conf.m4 b/tmpfiles.d/etc.conf.m4
index ef7b9b9541..928105ea8d 100644
--- a/tmpfiles.d/etc.conf.m4
+++ b/tmpfiles.d/etc.conf.m4
@@ -13,9 +13,6 @@ L+ /etc/mtab - - - - ../proc/self/mounts
 m4_ifdef(`HAVE_SMACK_RUN_LABEL',
 t /etc/mtab - - - - security.SMACK64=_
 )m4_dnl
-m4_ifdef(`ENABLE_RESOLVED',
-L! /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf
-)m4_dnl
 C /etc/nsswitch.conf - - - -
 m4_ifdef(`HAVE_PAM',
 C /etc/pam.d - - - -
diff --git a/tmpfiles.d/systemd-resolved.conf b/tmpfiles.d/systemd-resolved.conf
new file mode 100644
index 0000000000..3160f5cf7e
--- /dev/null
+++ b/tmpfiles.d/systemd-resolved.conf
@@ -0,0 +1,10 @@
+#  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.
+
+# See tmpfiles.d(5) for details
+
+L! /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf
diff --git a/tools/move.sh b/tools/move.sh
index 62666feace..841d90b41e 100755
--- a/tools/move.sh
+++ b/tools/move.sh
@@ -451,6 +451,7 @@ move_files() (
 	for l in device hwdb netlink network resolve; do
 		mv -T src/libsystemd/include/systemd/sd-$l.h src/libsystemd/src/sd-$l/sd-$l.h
 	done
+	mv -T systemd{,-journald}.tmpfiles.m4
 
 	# auto-distribute the stuff
 	for d in man units sysusers.d tmpfiles.d; do
@@ -657,10 +658,8 @@ fixup_makefiles() (
 	done
 )
 
-breakup_misc() {
-	# zsh completion
-	(
-		sed_expr='
+breakup_zshcompletion() (
+	sed_expr='
 		1 {
 			i #compdef %s
 			d
@@ -673,44 +672,20 @@ breakup_misc() {
 		}
 	'
 
-		cd shell-completion/zsh
-		read -r _ cmds < _systemd
-		for cmd in $cmds; do
-			printf -v cmd_sed_expr "$sed_expr" $cmd $cmd
-			sed -e "$cmd_sed_expr" < _systemd > _$cmd
-		done
-		rm _systemd
-	)
-	# sysusers
-	(
-		cd sysusers.d
-
-		for p in systemd-{journald,networkd,resolved,timesyncd,coredump}; do
-			grep -e '^#' -e '^$' -e "${p%d}" < systemd.conf.m4 > "$p".conf
-		done
-		rm systemd.conf.m4
-
-		for p in systemd-journal-{gatewayd,remote,upload}; do
-			grep -e '^#' -e '^$' -e "${p%d}" < systemd-remote.conf.m4 > "$p".conf
-		done
-		rm systemd-remote.conf.m4
-	)
-	# tmpfiles
-	(
-		cd tmpfiles.d
-
-		sed -n -e '/^#/p' -e '/^$/p' -e '/m4_ifdef(`ENABLE_RESOLVED/,/)/p' < etc.conf.m4 | grep -v m4 > systemd-resolved.conf
-		sed -i                          '/m4_ifdef(`ENABLE_RESOLVED/,/)/d'   etc.conf.m4
-
-		mv -T systemd{,-journald}.conf.m4
-	)
-}
+	cd shell-completion/zsh
+	read -r _ cmds < _systemd
+	for cmd in $cmds; do
+		printf -v cmd_sed_expr "$sed_expr" $cmd $cmd
+		sed -e "$cmd_sed_expr" < _systemd > _$cmd
+	done
+	rm _systemd
+)
 
 move() (
         find . \( -name Makefile -o -name '*.mk' \) -delete
 
-	>&2 echo ' => breakup_misc'
-	breakup_misc
+	>&2 echo ' => breakup_zshcompletion'
+	breakup_zshcompletion
 	>&2 echo ' => move_files'
 	move_files
 	>&2 echo ' => breakup_makefile'