[systemd-devel] [RFC 24/25] units: order options before other arguments

[Emil Renner Berthing]

---
 units/initrd-udevadm-cleanup-db.service.in | 2 +-
 units/kmod-static-nodes.service.in         | 2 +-
 units/systemd-journal-flush.service.in     | 2 +-
 units/systemd-udev-hwdb-update.service.in  | 2 +-
 units/systemd-udev-trigger.service.in      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/units/initrd-udevadm-cleanup-db.service.in b/units/initrd-udevadm-cleanup-db.service.in
index 5c6654e..3ec5451 100644
--- a/units/initrd-udevadm-cleanup-db.service.in
+++ b/units/initrd-udevadm-cleanup-db.service.in
@@ -15,4 +15,4 @@ Before=initrd-switch-root.target
 
 [Service]
 Type=oneshot
-ExecStart=- at rootbindir@/udevadm info --cleanup-db
+ExecStart=- at rootbindir@/udevadm --cleanup-db info
diff --git a/units/kmod-static-nodes.service.in b/units/kmod-static-nodes.service.in
index 0934a87..1b5e71d 100644
--- a/units/kmod-static-nodes.service.in
+++ b/units/kmod-static-nodes.service.in
@@ -15,4 +15,4 @@ ConditionPathExists=/lib/modules/%v/modules.devname
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=@KMOD@ static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf
+ExecStart=@KMOD@ --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf static-nodes
diff --git a/units/systemd-journal-flush.service.in b/units/systemd-journal-flush.service.in
index 503e8a6..29b9342 100644
--- a/units/systemd-journal-flush.service.in
+++ b/units/systemd-journal-flush.service.in
@@ -14,5 +14,5 @@ After=systemd-journald.service local-fs.target remote-fs.target
 Before=systemd-user-sessions.service
 
 [Service]
-ExecStart=@rootbindir@/systemctl kill --kill-who=main --signal=SIGUSR1 systemd-journald.service
+ExecStart=@rootbindir@/systemctl --kill-who=main --signal=SIGUSR1 kill systemd-journald.service
 Type=oneshot
diff --git a/units/systemd-udev-hwdb-update.service.in b/units/systemd-udev-hwdb-update.service.in
index 153d93c..ec4b8c4 100644
--- a/units/systemd-udev-hwdb-update.service.in
+++ b/units/systemd-udev-hwdb-update.service.in
@@ -17,4 +17,4 @@ ConditionNeedsUpdate=/etc
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=@rootbindir@/udevadm hwdb --update
+ExecStart=@rootbindir@/udevadm --update hwdb
diff --git a/units/systemd-udev-trigger.service.in b/units/systemd-udev-trigger.service.in
index 0c33909..101adaf 100644
--- a/units/systemd-udev-trigger.service.in
+++ b/units/systemd-udev-trigger.service.in
@@ -17,4 +17,4 @@ ConditionPathIsReadWrite=/sys
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=@rootbindir@/udevadm trigger --type=subsystems --action=add ; @rootbindir@/udevadm trigger --type=devices --action=add
+ExecStart=@rootbindir@/udevadm --type=subsystems --action=add trigger ; @rootbindir@/udevadm --type=devices --action=add trigger
-- 
2.1.0