units: drop full paths for utilities in $PATH

This makes things a bit simpler and the build a bit faster, because we don't
have to rewrite files to do the trivial substitution. @rootbindir@ is always in
our internal $PATH that we use for non-absolute paths, so there should be no
functional change.

diff --git a/meson.build b/meson.build
index 46f3e9c7ba31179196b9d2b3a1251585a671e38f..848140bb03fbdceb4c94824f19165807592bb69b 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -281,7 +281,6 @@ substs.set('userenvgeneratordir',                             userenvgeneratordi
 substs.set('systemshutdowndir',                               systemshutdowndir)
 substs.set('systemsleepdir',                                  systemsleepdir)
 substs.set('CERTIFICATEROOT',                                 get_option('certificate-root'))
-substs.set('SYSTEMCTL',                                       join_paths(rootbindir, 'systemctl'))
 substs.set('RANDOM_SEED',                                     join_paths(randomseeddir, 'random-seed'))
 substs.set('SYSTEM_SYSVINIT_PATH',                            sysvinit_path)
 substs.set('SYSTEM_SYSVRCND_PATH',                            sysvrcnd_path)

diff --git a/units/initrd-cleanup.service b/units/initrd-cleanup.service
new file mode 100644 (file)
index 0000000..b046076
--- /dev/null
+++ b/units/initrd-cleanup.service
@@ -0,0 +1,20 @@
+#  SPDX-License-Identifier: LGPL-2.1+
+#
+#  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.
+
+[Unit]
+Description=Cleaning Up and Shutting Down Daemons
+DefaultDependencies=no
+ConditionPathExists=/etc/initrd-release
+OnFailure=emergency.target
+OnFailureJobMode=replace-irreversibly
+After=initrd-root-fs.target initrd-fs.target initrd.target
+
+[Service]
+Type=oneshot
+ExecStart=systemctl --no-block isolate initrd-switch-root.target

diff --git a/units/initrd-cleanup.service.in b/units/initrd-cleanup.service.in
deleted file mode 100644 (file)
index 9775540..0000000
--- a/units/initrd-cleanup.service.in
+++ /dev/null
@@ -1,20 +0,0 @@
-#  SPDX-License-Identifier: LGPL-2.1+
-#
-#  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.
-
-[Unit]
-Description=Cleaning Up and Shutting Down Daemons
-DefaultDependencies=no
-ConditionPathExists=/etc/initrd-release
-OnFailure=emergency.target
-OnFailureJobMode=replace-irreversibly
-After=initrd-root-fs.target initrd-fs.target initrd.target
-
-[Service]
-Type=oneshot
-ExecStart=@rootbindir@/systemctl --no-block isolate initrd-switch-root.target

diff --git a/units/initrd-parse-etc.service b/units/initrd-parse-etc.service
new file mode 100644 (file)
index 0000000..b0e3836
--- /dev/null
+++ b/units/initrd-parse-etc.service
@@ -0,0 +1,24 @@
+#  SPDX-License-Identifier: LGPL-2.1+
+#
+#  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.
+
+[Unit]
+Description=Reload Configuration from the Real Root
+DefaultDependencies=no
+Requires=initrd-root-fs.target
+After=initrd-root-fs.target
+OnFailure=emergency.target
+OnFailureJobMode=replace-irreversibly
+ConditionPathExists=/etc/initrd-release
+
+[Service]
+Type=oneshot
+ExecStartPre=-systemctl daemon-reload
+# we have to retrigger initrd-fs.target after daemon-reload
+ExecStart=-systemctl --no-block start initrd-fs.target
+ExecStart=systemctl --no-block start initrd-cleanup.service

diff --git a/units/initrd-parse-etc.service.in b/units/initrd-parse-etc.service.in
deleted file mode 100644 (file)
index 2b3cd61..0000000
--- a/units/initrd-parse-etc.service.in
+++ /dev/null
@@ -1,24 +0,0 @@
-#  SPDX-License-Identifier: LGPL-2.1+
-#
-#  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.
-
-[Unit]
-Description=Reload Configuration from the Real Root
-DefaultDependencies=no
-Requires=initrd-root-fs.target
-After=initrd-root-fs.target
-OnFailure=emergency.target
-OnFailureJobMode=replace-irreversibly
-ConditionPathExists=/etc/initrd-release
-
-[Service]
-Type=oneshot
-ExecStartPre=-@rootbindir@/systemctl daemon-reload
-# we have to retrigger initrd-fs.target after daemon-reload
-ExecStart=-@rootbindir@/systemctl --no-block start initrd-fs.target
-ExecStart=@rootbindir@/systemctl --no-block start initrd-cleanup.service

diff --git a/units/initrd-switch-root.service b/units/initrd-switch-root.service
new file mode 100644 (file)
index 0000000..c1a3792
--- /dev/null
+++ b/units/initrd-switch-root.service
@@ -0,0 +1,20 @@
+#  SPDX-License-Identifier: LGPL-2.1+
+#
+#  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.
+
+[Unit]
+Description=Switch Root
+DefaultDependencies=no
+ConditionPathExists=/etc/initrd-release
+OnFailure=emergency.target
+OnFailureJobMode=replace-irreversibly
+AllowIsolate=yes
+
+[Service]
+Type=oneshot
+ExecStart=systemctl --no-block switch-root /sysroot

diff --git a/units/initrd-switch-root.service.in b/units/initrd-switch-root.service.in
deleted file mode 100644 (file)
index 6ce468e..0000000
--- a/units/initrd-switch-root.service.in
+++ /dev/null
@@ -1,20 +0,0 @@
-#  SPDX-License-Identifier: LGPL-2.1+
-#
-#  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.
-
-[Unit]
-Description=Switch Root
-DefaultDependencies=no
-ConditionPathExists=/etc/initrd-release
-OnFailure=emergency.target
-OnFailureJobMode=replace-irreversibly
-AllowIsolate=yes
-
-[Service]
-Type=oneshot
-ExecStart=@rootbindir@/systemctl --no-block switch-root /sysroot

diff --git a/units/initrd-udevadm-cleanup-db.service b/units/initrd-udevadm-cleanup-db.service
new file mode 100644 (file)
index 0000000..ad2f2a5
--- /dev/null
+++ b/units/initrd-udevadm-cleanup-db.service
@@ -0,0 +1,20 @@
+#  SPDX-License-Identifier: LGPL-2.1+
+#
+#  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.
+
+[Unit]
+Description=Cleanup udevd DB
+DefaultDependencies=no
+ConditionPathExists=/etc/initrd-release
+Conflicts=systemd-udevd.service systemd-udevd-control.socket systemd-udevd-kernel.socket systemd-udev-trigger.service systemd-udev-settle.service
+After=systemd-udevd.service systemd-udevd-control.socket systemd-udevd-kernel.socket systemd-udev-trigger.service systemd-udev-settle.service
+Before=initrd-switch-root.target
+
+[Service]
+Type=oneshot
+ExecStart=-udevadm info --cleanup-db

diff --git a/units/initrd-udevadm-cleanup-db.service.in b/units/initrd-udevadm-cleanup-db.service.in
deleted file mode 100644 (file)
index 09af690..0000000
--- a/units/initrd-udevadm-cleanup-db.service.in
+++ /dev/null
@@ -1,20 +0,0 @@
-#  SPDX-License-Identifier: LGPL-2.1+
-#
-#  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.
-
-[Unit]
-Description=Cleanup udevd DB
-DefaultDependencies=no
-ConditionPathExists=/etc/initrd-release
-Conflicts=systemd-udevd.service systemd-udevd-control.socket systemd-udevd-kernel.socket systemd-udev-trigger.service systemd-udev-settle.service
-After=systemd-udevd.service systemd-udevd-control.socket systemd-udevd-kernel.socket systemd-udev-trigger.service systemd-udev-settle.service
-Before=initrd-switch-root.target
-
-[Service]
-Type=oneshot
-ExecStart=-@rootbindir@/udevadm info --cleanup-db

diff --git a/units/meson.build b/units/meson.build
index 82c399bee89fd4e938eb1401d39b36fb7356bbc6..f7653c920c96485ff0543b3a69701b4617740d18 100644 (file)
--- a/units/meson.build
+++ b/units/meson.build
@@ -23,10 +23,14 @@ units = [
         ['hibernate.target',                    'ENABLE_HIBERNATE'],
         ['hybrid-sleep.target',                 'ENABLE_HIBERNATE'],
         ['suspend-then-hibernate.target',       'ENABLE_HIBERNATE'],
+        ['initrd-cleanup.service',              ''],
         ['initrd-fs.target',                    ''],
+        ['initrd-parse-etc.service',            ''],
         ['initrd-root-device.target',           ''],
         ['initrd-root-fs.target',               ''],
+        ['initrd-switch-root.service',          ''],
         ['initrd-switch-root.target',           ''],
+        ['initrd-udevadm-cleanup-db.service',   ''],
         ['initrd.target',                       ''],
         ['kexec.target',                        ''],
         ['ldconfig.service',                    'ENABLE_LDCONFIG',
@@ -81,13 +85,24 @@ units = [
         ['system-update-cleanup.service',       ''],
         ['systemd-ask-password-console.path',   '',
          'sysinit.target.wants/'],
+        ['systemd-ask-password-console.service', ''],
         ['systemd-ask-password-wall.path',      '',
          'multi-user.target.wants/'],
+        ['systemd-ask-password-wall.service',   ''],
+        ['systemd-boot-system-token.service',   'ENABLE_EFI',
+         'sysinit.target.wants/'],
         ['systemd-coredump.socket',             'ENABLE_COREDUMP',
          'sockets.target.wants/'],
-        ['systemd-exit.service',                 ''],
+        ['systemd-exit.service',                ''],
+        ['systemd-firstboot.service',           'ENABLE_FIRSTBOOT',
+         'sysinit.target.wants/'],
+        ['systemd-halt.service',                ''],
         ['systemd-initctl.socket',              '',
          'sockets.target.wants/'],
+        ['systemd-journal-catalog-update.service', '',
+         'sysinit.target.wants/'],
+        ['systemd-journal-flush.service',       '',
+         'sysinit.target.wants/'],
         ['systemd-journal-gatewayd.socket',     'ENABLE_REMOTE HAVE_MICROHTTPD'],
         ['systemd-journal-remote.socket',       'ENABLE_REMOTE HAVE_MICROHTTPD'],
         ['systemd-journald-audit.socket',       '',
@@ -96,18 +111,31 @@ units = [
          'sockets.target.wants/'],
         ['systemd-journald.socket',             '',
          'sockets.target.wants/'],
-        ['systemd-userdbd.socket',              'ENABLE_USERDB',
-         'sockets.target.wants/'],
+        ['systemd-kexec.service',               ''],
+        ['systemd-machine-id-commit.service',   '',
+         'sysinit.target.wants/'],
         ['systemd-networkd.socket',             'ENABLE_NETWORKD'],
-        ['systemd-poweroff.service',             ''],
-        ['systemd-reboot.service',               ''],
+        ['systemd-poweroff.service',            ''],
+        ['systemd-reboot.service',              ''],
         ['systemd-rfkill.socket',               'ENABLE_RFKILL'],
+        ['systemd-sysusers.service',            'ENABLE_SYSUSERS',
+         'sysinit.target.wants/'],
+        ['systemd-tmpfiles-clean.service',      'ENABLE_TMPFILES'],
         ['systemd-tmpfiles-clean.timer',        'ENABLE_TMPFILES',
          'timers.target.wants/'],
+        ['systemd-tmpfiles-setup-dev.service',  'ENABLE_TMPFILES',
+         'sysinit.target.wants/'],
+        ['systemd-tmpfiles-setup.service',      'ENABLE_TMPFILES',
+         'sysinit.target.wants/'],
         ['systemd-udevd-control.socket',        '',
          'sockets.target.wants/'],
+        ['systemd-udev-settle.service',         ''],
+        ['systemd-udev-trigger.service',        '',
+         'sysinit.target.wants/'],
         ['systemd-udevd-kernel.socket',         '',
          'sockets.target.wants/'],
+        ['systemd-userdbd.socket',              'ENABLE_USERDB',
+         'sockets.target.wants/'],
         ['time-set.target',                     ''],
         ['time-sync.target',                    ''],
         ['timers.target',                       ''],
@@ -122,31 +150,20 @@ units = [
 in_units = [
         ['debug-shell.service',                  ''],
         ['emergency.service',                    ''],
-        ['initrd-cleanup.service',               ''],
-        ['initrd-parse-etc.service',             ''],
-        ['initrd-switch-root.service',           ''],
-        ['initrd-udevadm-cleanup-db.service',    ''],
         ['kmod-static-nodes.service',            'HAVE_KMOD ENABLE_TMPFILES',
          'sysinit.target.wants/'],
         ['quotaon.service',                      'ENABLE_QUOTACHECK'],
         ['rc-local.service',                     'HAVE_SYSV_COMPAT'],
         ['rescue.service',                       ''],
-        ['systemd-ask-password-console.service', ''],
-        ['systemd-ask-password-wall.service',    ''],
         ['systemd-backlight@.service',           'ENABLE_BACKLIGHT'],
         ['systemd-binfmt.service',               'ENABLE_BINFMT',
          'sysinit.target.wants/'],
         ['systemd-bless-boot.service',           'ENABLE_EFI HAVE_BLKID'],
         ['systemd-boot-check-no-failures.service', ''],
-        ['systemd-boot-system-token.service',    'ENABLE_EFI',
-         'sysinit.target.wants/'],
         ['systemd-coredump@.service',            'ENABLE_COREDUMP'],
         ['systemd-pstore.service',               'ENABLE_PSTORE'],
-        ['systemd-firstboot.service',            'ENABLE_FIRSTBOOT',
-         'sysinit.target.wants/'],
         ['systemd-fsck-root.service',            ''],
         ['systemd-fsck@.service',                ''],
-        ['systemd-halt.service',                 ''],
         ['systemd-hibernate-resume@.service',    'ENABLE_HIBERNATE'],
         ['systemd-hibernate.service',            'ENABLE_HIBERNATE'],
         ['systemd-hybrid-sleep.service',         'ENABLE_HIBERNATE'],
@@ -158,22 +175,15 @@ in_units = [
         ['systemd-importd.service',              'ENABLE_IMPORTD',
          'dbus-org.freedesktop.import1.service'],
         ['systemd-initctl.service',               ''],
-        ['systemd-journal-catalog-update.service', '',
-         'sysinit.target.wants/'],
-        ['systemd-journal-flush.service',         '',
-         'sysinit.target.wants/'],
         ['systemd-journal-gatewayd.service',     'ENABLE_REMOTE HAVE_MICROHTTPD'],
         ['systemd-journal-remote.service',       'ENABLE_REMOTE HAVE_MICROHTTPD'],
         ['systemd-journal-upload.service',       'ENABLE_REMOTE HAVE_LIBCURL'],
         ['systemd-journald.service',             '',
          'sysinit.target.wants/'],
-        ['systemd-kexec.service',                ''],
         ['systemd-localed.service',              'ENABLE_LOCALED',
          'dbus-org.freedesktop.locale1.service'],
         ['systemd-logind.service',               'ENABLE_LOGIND',
          'multi-user.target.wants/ dbus-org.freedesktop.login1.service'],
-        ['systemd-machine-id-commit.service',    '',
-         'sysinit.target.wants/'],
         ['systemd-machined.service',             'ENABLE_MACHINED',
          'dbus-org.freedesktop.machine1.service'],
         ['systemd-modules-load.service',         'HAVE_KMOD',
@@ -194,20 +204,10 @@ in_units = [
         ['systemd-suspend.service',              ''],
         ['systemd-sysctl.service',               '',
          'sysinit.target.wants/'],
-        ['systemd-sysusers.service',             'ENABLE_SYSUSERS',
-         'sysinit.target.wants/'],
         ['systemd-timedated.service',            'ENABLE_TIMEDATED',
          'dbus-org.freedesktop.timedate1.service'],
         ['systemd-timesyncd.service',            'ENABLE_TIMESYNCD'],
         ['systemd-time-wait-sync.service',       'ENABLE_TIMESYNCD'],
-        ['systemd-tmpfiles-clean.service',       'ENABLE_TMPFILES'],
-        ['systemd-tmpfiles-setup-dev.service',   'ENABLE_TMPFILES',
-         'sysinit.target.wants/'],
-        ['systemd-tmpfiles-setup.service',       'ENABLE_TMPFILES',
-         'sysinit.target.wants/'],
-        ['systemd-udev-settle.service',          ''],
-        ['systemd-udev-trigger.service',         '',
-         'sysinit.target.wants/'],
         ['systemd-udevd.service',                '',
          'sysinit.target.wants/'],
         ['systemd-update-done.service',          '',

diff --git a/units/systemd-ask-password-console.service b/units/systemd-ask-password-console.service
new file mode 100644 (file)
index 0000000..6ee4c25
--- /dev/null
+++ b/units/systemd-ask-password-console.service
@@ -0,0 +1,21 @@
+#  SPDX-License-Identifier: LGPL-2.1+
+#
+#  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.
+
+[Unit]
+Description=Dispatch Password Requests to Console
+Documentation=man:systemd-ask-password-console.service(8)
+DefaultDependencies=no
+Conflicts=shutdown.target emergency.service
+After=plymouth-start.service systemd-vconsole-setup.service
+Before=shutdown.target
+ConditionPathExists=!/run/plymouth/pid
+
+[Service]
+ExecStart=systemd-tty-ask-password-agent --watch --console
+SystemCallArchitectures=native

diff --git a/units/systemd-ask-password-console.service.in b/units/systemd-ask-password-console.service.in
deleted file mode 100644 (file)
index 60fa7c3..0000000
--- a/units/systemd-ask-password-console.service.in
+++ /dev/null
@@ -1,21 +0,0 @@
-#  SPDX-License-Identifier: LGPL-2.1+
-#
-#  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.
-
-[Unit]
-Description=Dispatch Password Requests to Console
-Documentation=man:systemd-ask-password-console.service(8)
-DefaultDependencies=no
-Conflicts=shutdown.target emergency.service
-After=plymouth-start.service systemd-vconsole-setup.service
-Before=shutdown.target
-ConditionPathExists=!/run/plymouth/pid
-
-[Service]
-ExecStart=@rootbindir@/systemd-tty-ask-password-agent --watch --console
-SystemCallArchitectures=native

diff --git a/units/systemd-ask-password-wall.service b/units/systemd-ask-password-wall.service
new file mode 100644 (file)
index 0000000..52a3037
--- /dev/null
+++ b/units/systemd-ask-password-wall.service
@@ -0,0 +1,18 @@
+#  SPDX-License-Identifier: LGPL-2.1+
+#
+#  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.
+
+[Unit]
+Description=Forward Password Requests to Wall
+Documentation=man:systemd-ask-password-console.service(8)
+After=systemd-user-sessions.service
+
+[Service]
+ExecStartPre=-systemctl stop systemd-ask-password-console.path systemd-ask-password-console.service systemd-ask-password-plymouth.path systemd-ask-password-plymouth.service
+ExecStart=systemd-tty-ask-password-agent --wall
+SystemCallArchitectures=native

diff --git a/units/systemd-ask-password-wall.service.in b/units/systemd-ask-password-wall.service.in
deleted file mode 100644 (file)
index 1e4808b..0000000
--- a/units/systemd-ask-password-wall.service.in
+++ /dev/null
@@ -1,18 +0,0 @@
-#  SPDX-License-Identifier: LGPL-2.1+
-#
-#  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.
-
-[Unit]
-Description=Forward Password Requests to Wall
-Documentation=man:systemd-ask-password-console.service(8)
-After=systemd-user-sessions.service
-
-[Service]
-ExecStartPre=-@SYSTEMCTL@ stop systemd-ask-password-console.path systemd-ask-password-console.service systemd-ask-password-plymouth.path systemd-ask-password-plymouth.service
-ExecStart=@rootbindir@/systemd-tty-ask-password-agent --wall
-SystemCallArchitectures=native

diff --git a/units/systemd-boot-system-token.service b/units/systemd-boot-system-token.service
new file mode 100644 (file)
index 0000000..8aead02
--- /dev/null
+++ b/units/systemd-boot-system-token.service
@@ -0,0 +1,34 @@
+#  SPDX-License-Identifier: LGPL-2.1+
+#
+#  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.
+
+[Unit]
+Description=Store a System Token in an EFI Variable
+Documentation=man:systemd-boot-system-token.service(8)
+DefaultDependencies=no
+Conflicts=shutdown.target
+After=local-fs.target systemd-random-seed.service
+Before=shutdown.target
+
+# Don't run this in a VM environment, because there EFI variables are not
+# actually stored in NVRAM, independent of regular storage.
+ConditionVirtualization=no
+
+# Only run this if the boot loader can support random seed initialization.
+ConditionPathExists=/sys/firmware/efi/efivars/LoaderFeatures-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f
+
+# Only run this if there is no system token defined yet, or …
+ConditionPathExists=|!/sys/firmware/efi/efivars/LoaderSystemToken-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f
+
+# … if the boot loader didn't pass the OS a random seed (and thus probably was missing the random seed file)
+ConditionPathExists=|!/sys/firmware/efi/efivars/LoaderRandomSeed-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=bootctl random-seed --graceful

diff --git a/units/systemd-boot-system-token.service.in b/units/systemd-boot-system-token.service.in
deleted file mode 100644 (file)
index e9b742c..0000000
--- a/units/systemd-boot-system-token.service.in
+++ /dev/null
@@ -1,34 +0,0 @@
-#  SPDX-License-Identifier: LGPL-2.1+
-#
-#  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.
-
-[Unit]
-Description=Store a System Token in an EFI Variable
-Documentation=man:systemd-boot-system-token.service(8)
-DefaultDependencies=no
-Conflicts=shutdown.target
-After=local-fs.target systemd-random-seed.service
-Before=shutdown.target
-
-# Don't run this in a VM environment, because there EFI variables are not
-# actually stored in NVRAM, independent of regular storage.
-ConditionVirtualization=no
-
-# Only run this if the boot loader can support random seed initialization.
-ConditionPathExists=/sys/firmware/efi/efivars/LoaderFeatures-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f
-
-# Only run this if there is no system token defined yet, or …
-ConditionPathExists=|!/sys/firmware/efi/efivars/LoaderSystemToken-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f
-
-# … if the boot loader didn't pass the OS a random seed (and thus probably was missing the random seed file)
-ConditionPathExists=|!/sys/firmware/efi/efivars/LoaderRandomSeed-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=@bindir@/bootctl random-seed --graceful

diff --git a/units/systemd-firstboot.service b/units/systemd-firstboot.service
new file mode 100644 (file)
index 0000000..9f5c710
--- /dev/null
+++ b/units/systemd-firstboot.service
@@ -0,0 +1,26 @@
+#  SPDX-License-Identifier: LGPL-2.1+
+#
+#  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.
+
+[Unit]
+Description=First Boot Wizard
+Documentation=man:systemd-firstboot(1)
+DefaultDependencies=no
+Conflicts=shutdown.target
+After=systemd-remount-fs.service
+Before=systemd-sysusers.service sysinit.target shutdown.target
+ConditionPathIsReadWrite=/etc
+ConditionFirstBoot=yes
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=systemd-firstboot --prompt-locale --prompt-timezone --prompt-root-password
+StandardOutput=tty
+StandardInput=tty
+StandardError=tty

diff --git a/units/systemd-firstboot.service.in b/units/systemd-firstboot.service.in
deleted file mode 100644 (file)
index d4deba9..0000000
--- a/units/systemd-firstboot.service.in
+++ /dev/null
@@ -1,26 +0,0 @@
-#  SPDX-License-Identifier: LGPL-2.1+
-#
-#  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.
-
-[Unit]
-Description=First Boot Wizard
-Documentation=man:systemd-firstboot(1)
-DefaultDependencies=no
-Conflicts=shutdown.target
-After=systemd-remount-fs.service
-Before=systemd-sysusers.service sysinit.target shutdown.target
-ConditionPathIsReadWrite=/etc
-ConditionFirstBoot=yes
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=@rootbindir@/systemd-firstboot --prompt-locale --prompt-timezone --prompt-root-password
-StandardOutput=tty
-StandardInput=tty
-StandardError=tty

diff --git a/units/systemd-halt.service b/units/systemd-halt.service
new file mode 100644 (file)
index 0000000..cd16d1d
--- /dev/null
+++ b/units/systemd-halt.service
@@ -0,0 +1,19 @@
+#  SPDX-License-Identifier: LGPL-2.1+
+#
+#  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.
+
+[Unit]
+Description=Halt
+Documentation=man:systemd-halt.service(8)
+DefaultDependencies=no
+Requires=shutdown.target umount.target final.target
+After=shutdown.target umount.target final.target
+
+[Service]
+Type=oneshot
+ExecStart=systemctl --force halt

diff --git a/units/systemd-halt.service.in b/units/systemd-halt.service.in
deleted file mode 100644 (file)
index 09c1005..0000000
--- a/units/systemd-halt.service.in
+++ /dev/null
@@ -1,19 +0,0 @@
-#  SPDX-License-Identifier: LGPL-2.1+
-#
-#  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.
-
-[Unit]
-Description=Halt
-Documentation=man:systemd-halt.service(8)
-DefaultDependencies=no
-Requires=shutdown.target umount.target final.target
-After=shutdown.target umount.target final.target
-
-[Service]
-Type=oneshot
-ExecStart=@SYSTEMCTL@ --force halt

diff --git a/units/systemd-hwdb-update.service.in b/units/systemd-hwdb-update.service.in
index 259fe0de8b01e39c2c708cc02b34ffaaf9620d24..9887018a1f23631a3ca7e2cfd0f9f8b935054fee 100644 (file)
--- a/units/systemd-hwdb-update.service.in
+++ b/units/systemd-hwdb-update.service.in
@@ -22,5 +22,5 @@ ConditionDirectoryNotEmpty=|/etc/udev/hwdb.d/
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=@rootbindir@/systemd-hwdb update
+ExecStart=systemd-hwdb update
 TimeoutSec=90s

diff --git a/units/systemd-journal-catalog-update.service b/units/systemd-journal-catalog-update.service
new file mode 100644 (file)
index 0000000..6db55a5
--- /dev/null
+++ b/units/systemd-journal-catalog-update.service
@@ -0,0 +1,23 @@
+#  SPDX-License-Identifier: LGPL-2.1+
+#
+#  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.
+
+[Unit]
+Description=Rebuild Journal Catalog
+Documentation=man:systemd-journald.service(8) man:journald.conf(5)
+DefaultDependencies=no
+Conflicts=shutdown.target
+After=local-fs.target systemd-tmpfiles-setup.service
+Before=sysinit.target shutdown.target systemd-update-done.service
+ConditionNeedsUpdate=/var
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=journalctl --update-catalog
+TimeoutSec=90s

diff --git a/units/systemd-journal-catalog-update.service.in b/units/systemd-journal-catalog-update.service.in
deleted file mode 100644 (file)
index 18b2739..0000000
--- a/units/systemd-journal-catalog-update.service.in
+++ /dev/null
@@ -1,23 +0,0 @@
-#  SPDX-License-Identifier: LGPL-2.1+
-#
-#  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.
-
-[Unit]
-Description=Rebuild Journal Catalog
-Documentation=man:systemd-journald.service(8) man:journald.conf(5)
-DefaultDependencies=no
-Conflicts=shutdown.target
-After=local-fs.target systemd-tmpfiles-setup.service
-Before=sysinit.target shutdown.target systemd-update-done.service
-ConditionNeedsUpdate=/var
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=@rootbindir@/journalctl --update-catalog
-TimeoutSec=90s

diff --git a/units/systemd-journal-flush.service b/units/systemd-journal-flush.service
new file mode 100644 (file)
index 0000000..0f45743
--- /dev/null
+++ b/units/systemd-journal-flush.service
@@ -0,0 +1,24 @@
+#  SPDX-License-Identifier: LGPL-2.1+
+#
+#  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.
+
+[Unit]
+Description=Flush Journal to Persistent Storage
+Documentation=man:systemd-journald.service(8) man:journald.conf(5)
+DefaultDependencies=no
+Requires=systemd-journald.service
+After=systemd-journald.service systemd-remount-fs.service
+Before=systemd-tmpfiles-setup.service
+RequiresMountsFor=/var/log/journal
+
+[Service]
+ExecStart=journalctl --flush
+ExecStop=journalctl --smart-relinquish-var
+Type=oneshot
+RemainAfterExit=yes
+TimeoutSec=90s

diff --git a/units/systemd-journal-flush.service.in b/units/systemd-journal-flush.service.in
deleted file mode 100644 (file)
index 29b006c..0000000
--- a/units/systemd-journal-flush.service.in
+++ /dev/null
@@ -1,24 +0,0 @@
-#  SPDX-License-Identifier: LGPL-2.1+
-#
-#  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.
-
-[Unit]
-Description=Flush Journal to Persistent Storage
-Documentation=man:systemd-journald.service(8) man:journald.conf(5)
-DefaultDependencies=no
-Requires=systemd-journald.service
-After=systemd-journald.service systemd-remount-fs.service
-Before=systemd-tmpfiles-setup.service
-RequiresMountsFor=/var/log/journal
-
-[Service]
-ExecStart=@rootbindir@/journalctl --flush
-ExecStop=@rootbindir@/journalctl --smart-relinquish-var
-Type=oneshot
-RemainAfterExit=yes
-TimeoutSec=90s

diff --git a/units/systemd-kexec.service b/units/systemd-kexec.service
new file mode 100644 (file)
index 0000000..7413e1d
--- /dev/null
+++ b/units/systemd-kexec.service
@@ -0,0 +1,19 @@
+#  SPDX-License-Identifier: LGPL-2.1+
+#
+#  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.
+
+[Unit]
+Description=Reboot via kexec
+Documentation=man:systemd-halt.service(8)
+DefaultDependencies=no
+Requires=shutdown.target umount.target final.target
+After=shutdown.target umount.target final.target
+
+[Service]
+Type=oneshot
+ExecStart=systemctl --force kexec

diff --git a/units/systemd-kexec.service.in b/units/systemd-kexec.service.in
deleted file mode 100644 (file)
index 1201b23..0000000
--- a/units/systemd-kexec.service.in
+++ /dev/null
@@ -1,19 +0,0 @@
-#  SPDX-License-Identifier: LGPL-2.1+
-#
-#  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.
-
-[Unit]
-Description=Reboot via kexec
-Documentation=man:systemd-halt.service(8)
-DefaultDependencies=no
-Requires=shutdown.target umount.target final.target
-After=shutdown.target umount.target final.target
-
-[Service]
-Type=oneshot
-ExecStart=@SYSTEMCTL@ --force kexec

diff --git a/units/systemd-machine-id-commit.service b/units/systemd-machine-id-commit.service
new file mode 100644 (file)
index 0000000..e3acb0f
--- /dev/null
+++ b/units/systemd-machine-id-commit.service
@@ -0,0 +1,24 @@
+#  SPDX-License-Identifier: LGPL-2.1+
+#
+#  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.
+
+[Unit]
+Description=Commit a transient machine-id on disk
+Documentation=man:systemd-machine-id-commit.service(8)
+DefaultDependencies=no
+Conflicts=shutdown.target
+Before=sysinit.target shutdown.target
+After=local-fs.target
+ConditionPathIsReadWrite=/etc
+ConditionPathIsMountPoint=/etc/machine-id
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=systemd-machine-id-setup --commit
+TimeoutSec=30s

diff --git a/units/systemd-machine-id-commit.service.in b/units/systemd-machine-id-commit.service.in
deleted file mode 100644 (file)
index 4f34873..0000000
--- a/units/systemd-machine-id-commit.service.in
+++ /dev/null
@@ -1,24 +0,0 @@
-#  SPDX-License-Identifier: LGPL-2.1+
-#
-#  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.
-
-[Unit]
-Description=Commit a transient machine-id on disk
-Documentation=man:systemd-machine-id-commit.service(8)
-DefaultDependencies=no
-Conflicts=shutdown.target
-Before=sysinit.target shutdown.target
-After=local-fs.target
-ConditionPathIsReadWrite=/etc
-ConditionPathIsMountPoint=/etc/machine-id
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=@rootbindir@/systemd-machine-id-setup --commit
-TimeoutSec=30s

diff --git a/units/systemd-nspawn@.service.in b/units/systemd-nspawn@.service.in
index 5367ee44105b3bf7dddd21e2773f5473bdee7a64..51634472ac35c4dfff6ced1ae531b7706898b3f0 100644 (file)
--- a/units/systemd-nspawn@.service.in
+++ b/units/systemd-nspawn@.service.in
@@ -18,7 +18,7 @@ RequiresMountsFor=/var/lib/machines
 
 [Service]
 # Make sure the DeviceAllow= lines below can properly resolve the 'block-loop' expression (and others)
-ExecStart=@bindir@/systemd-nspawn --quiet --keep-unit --boot --link-journal=try-guest --network-veth -U --settings=override --machine=%i
+ExecStart=systemd-nspawn --quiet --keep-unit --boot --link-journal=try-guest --network-veth -U --settings=override --machine=%i
 KillMode=mixed
 Type=notify
 RestartForceExitStatus=133

diff --git a/units/systemd-sysusers.service b/units/systemd-sysusers.service
new file mode 100644 (file)
index 0000000..da05e0e
--- /dev/null
+++ b/units/systemd-sysusers.service
@@ -0,0 +1,23 @@
+#  SPDX-License-Identifier: LGPL-2.1+
+#
+#  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.
+
+[Unit]
+Description=Create System Users
+Documentation=man:sysusers.d(5) man:systemd-sysusers.service(8)
+DefaultDependencies=no
+Conflicts=shutdown.target
+After=systemd-remount-fs.service
+Before=sysinit.target shutdown.target systemd-update-done.service
+ConditionNeedsUpdate=/etc
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=systemd-sysusers
+TimeoutSec=90s

diff --git a/units/systemd-sysusers.service.in b/units/systemd-sysusers.service.in
deleted file mode 100644 (file)
index 4d11bbb..0000000
--- a/units/systemd-sysusers.service.in
+++ /dev/null
@@ -1,23 +0,0 @@
-#  SPDX-License-Identifier: LGPL-2.1+
-#
-#  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.
-
-[Unit]
-Description=Create System Users
-Documentation=man:sysusers.d(5) man:systemd-sysusers.service(8)
-DefaultDependencies=no
-Conflicts=shutdown.target
-After=systemd-remount-fs.service
-Before=sysinit.target shutdown.target systemd-update-done.service
-ConditionNeedsUpdate=/etc
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=@rootbindir@/systemd-sysusers
-TimeoutSec=90s

diff --git a/units/systemd-tmpfiles-clean.service b/units/systemd-tmpfiles-clean.service
new file mode 100644 (file)
index 0000000..f20bb14
--- /dev/null
+++ b/units/systemd-tmpfiles-clean.service
@@ -0,0 +1,22 @@
+#  SPDX-License-Identifier: LGPL-2.1+
+#
+#  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.
+
+[Unit]
+Description=Cleanup of Temporary Directories
+Documentation=man:tmpfiles.d(5) man:systemd-tmpfiles(8)
+DefaultDependencies=no
+Conflicts=shutdown.target
+After=local-fs.target time-set.target
+Before=shutdown.target
+
+[Service]
+Type=oneshot
+ExecStart=systemd-tmpfiles --clean
+SuccessExitStatus=DATAERR
+IOSchedulingClass=idle

diff --git a/units/systemd-tmpfiles-clean.service.in b/units/systemd-tmpfiles-clean.service.in
deleted file mode 100644 (file)
index 5d70aaf..0000000
--- a/units/systemd-tmpfiles-clean.service.in
+++ /dev/null
@@ -1,22 +0,0 @@
-#  SPDX-License-Identifier: LGPL-2.1+
-#
-#  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.
-
-[Unit]
-Description=Cleanup of Temporary Directories
-Documentation=man:tmpfiles.d(5) man:systemd-tmpfiles(8)
-DefaultDependencies=no
-Conflicts=shutdown.target
-After=local-fs.target time-set.target
-Before=shutdown.target
-
-[Service]
-Type=oneshot
-ExecStart=@rootbindir@/systemd-tmpfiles --clean
-SuccessExitStatus=DATAERR
-IOSchedulingClass=idle

diff --git a/units/systemd-tmpfiles-setup-dev.service b/units/systemd-tmpfiles-setup-dev.service
new file mode 100644 (file)
index 0000000..1027823
--- /dev/null
+++ b/units/systemd-tmpfiles-setup-dev.service
@@ -0,0 +1,22 @@
+#  SPDX-License-Identifier: LGPL-2.1+
+#
+#  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.
+
+[Unit]
+Description=Create Static Device Nodes in /dev
+Documentation=man:tmpfiles.d(5) man:systemd-tmpfiles(8)
+DefaultDependencies=no
+Conflicts=shutdown.target
+After=systemd-sysusers.service
+Before=sysinit.target local-fs-pre.target systemd-udevd.service shutdown.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=systemd-tmpfiles --prefix=/dev --create --boot
+SuccessExitStatus=DATAERR CANTCREAT

diff --git a/units/systemd-tmpfiles-setup-dev.service.in b/units/systemd-tmpfiles-setup-dev.service.in
deleted file mode 100644 (file)
index ed52db4..0000000
--- a/units/systemd-tmpfiles-setup-dev.service.in
+++ /dev/null
@@ -1,22 +0,0 @@
-#  SPDX-License-Identifier: LGPL-2.1+
-#
-#  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.
-
-[Unit]
-Description=Create Static Device Nodes in /dev
-Documentation=man:tmpfiles.d(5) man:systemd-tmpfiles(8)
-DefaultDependencies=no
-Conflicts=shutdown.target
-After=systemd-sysusers.service
-Before=sysinit.target local-fs-pre.target systemd-udevd.service shutdown.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=@rootbindir@/systemd-tmpfiles --prefix=/dev --create --boot
-SuccessExitStatus=DATAERR CANTCREAT

diff --git a/units/systemd-tmpfiles-setup.service b/units/systemd-tmpfiles-setup.service
new file mode 100644 (file)
index 0000000..29799ee
--- /dev/null
+++ b/units/systemd-tmpfiles-setup.service
@@ -0,0 +1,23 @@
+#  SPDX-License-Identifier: LGPL-2.1+
+#
+#  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.
+
+[Unit]
+Description=Create Volatile Files and Directories
+Documentation=man:tmpfiles.d(5) man:systemd-tmpfiles(8)
+DefaultDependencies=no
+Conflicts=shutdown.target
+After=local-fs.target systemd-sysusers.service systemd-journald.service
+Before=sysinit.target shutdown.target
+RefuseManualStop=yes
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=systemd-tmpfiles --create --remove --boot --exclude-prefix=/dev
+SuccessExitStatus=DATAERR CANTCREAT

diff --git a/units/systemd-tmpfiles-setup.service.in b/units/systemd-tmpfiles-setup.service.in
deleted file mode 100644 (file)
index 32a475d..0000000
--- a/units/systemd-tmpfiles-setup.service.in
+++ /dev/null
@@ -1,23 +0,0 @@
-#  SPDX-License-Identifier: LGPL-2.1+
-#
-#  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.
-
-[Unit]
-Description=Create Volatile Files and Directories
-Documentation=man:tmpfiles.d(5) man:systemd-tmpfiles(8)
-DefaultDependencies=no
-Conflicts=shutdown.target
-After=local-fs.target systemd-sysusers.service systemd-journald.service
-Before=sysinit.target shutdown.target
-RefuseManualStop=yes
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=@rootbindir@/systemd-tmpfiles --create --remove --boot --exclude-prefix=/dev
-SuccessExitStatus=DATAERR CANTCREAT

diff --git a/units/systemd-udev-settle.service b/units/systemd-udev-settle.service
new file mode 100644 (file)
index 0000000..ed6a68b
--- /dev/null
+++ b/units/systemd-udev-settle.service
@@ -0,0 +1,27 @@
+#  SPDX-License-Identifier: LGPL-2.1+
+#
+#  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.
+
+# This service can dynamically be pulled-in by legacy services which
+# cannot reliably cope with dynamic device configurations, and wrongfully
+# expect a populated /dev during bootup.
+
+[Unit]
+Description=udev Wait for Complete Device Initialization
+Documentation=man:systemd-udev-settle.service(8)
+DefaultDependencies=no
+Wants=systemd-udevd.service
+After=systemd-udev-trigger.service
+Before=sysinit.target
+ConditionPathIsReadWrite=/sys
+
+[Service]
+Type=oneshot
+TimeoutSec=180
+RemainAfterExit=yes
+ExecStart=udevadm settle

diff --git a/units/systemd-udev-settle.service.in b/units/systemd-udev-settle.service.in
deleted file mode 100644 (file)
index 22ebf08..0000000
--- a/units/systemd-udev-settle.service.in
+++ /dev/null
@@ -1,27 +0,0 @@
-#  SPDX-License-Identifier: LGPL-2.1+
-#
-#  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.
-
-# This service can dynamically be pulled-in by legacy services which
-# cannot reliably cope with dynamic device configurations, and wrongfully
-# expect a populated /dev during bootup.
-
-[Unit]
-Description=udev Wait for Complete Device Initialization
-Documentation=man:systemd-udev-settle.service(8)
-DefaultDependencies=no
-Wants=systemd-udevd.service
-After=systemd-udev-trigger.service
-Before=sysinit.target
-ConditionPathIsReadWrite=/sys
-
-[Service]
-Type=oneshot
-TimeoutSec=180
-RemainAfterExit=yes
-ExecStart=@rootbindir@/udevadm settle

diff --git a/units/systemd-udev-trigger.service b/units/systemd-udev-trigger.service
new file mode 100644 (file)
index 0000000..8a625b6
--- /dev/null
+++ b/units/systemd-udev-trigger.service
@@ -0,0 +1,23 @@
+#  SPDX-License-Identifier: LGPL-2.1+
+#
+#  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.
+
+[Unit]
+Description=udev Coldplug all Devices
+Documentation=man:udev(7) man:systemd-udevd.service(8)
+DefaultDependencies=no
+Wants=systemd-udevd.service
+After=systemd-udevd-kernel.socket systemd-udevd-control.socket
+Before=sysinit.target
+ConditionPathIsReadWrite=/sys
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=udevadm trigger --type=subsystems --action=add
+ExecStart=udevadm trigger --type=devices --action=add

diff --git a/units/systemd-udev-trigger.service.in b/units/systemd-udev-trigger.service.in
deleted file mode 100644 (file)
index b60204e..0000000
--- a/units/systemd-udev-trigger.service.in
+++ /dev/null
@@ -1,23 +0,0 @@
-#  SPDX-License-Identifier: LGPL-2.1+
-#
-#  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.
-
-[Unit]
-Description=udev Coldplug all Devices
-Documentation=man:udev(7) man:systemd-udevd.service(8)
-DefaultDependencies=no
-Wants=systemd-udevd.service
-After=systemd-udevd-kernel.socket systemd-udevd-control.socket
-Before=sysinit.target
-ConditionPathIsReadWrite=/sys
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=@rootbindir@/udevadm trigger --type=subsystems --action=add
-ExecStart=@rootbindir@/udevadm trigger --type=devices --action=add

diff --git a/units/systemd-udevd.service.in b/units/systemd-udevd.service.in
index 8b1dd0efc73fa91877f167dd910fd29f67dd8c8e..5eee69933bde944c9afc7db3779997891ecb3a06 100644 (file)
--- a/units/systemd-udevd.service.in
+++ b/units/systemd-udevd.service.in
@@ -23,7 +23,7 @@ Sockets=systemd-udevd-control.socket systemd-udevd-kernel.socket
 Restart=always
 RestartSec=0
 ExecStart=@rootlibexecdir@/systemd-udevd
-ExecReload=@rootbindir@/udevadm control --reload --timeout 0
+ExecReload=udevadm control --reload --timeout 0
 KillMode=mixed
 TasksMax=infinity
 PrivateMounts=yes

diff --git a/units/user/meson.build b/units/user/meson.build
index 36341a42f5abf48a22fadd7b075a18fb49a761ed..cb8f630b8cde79b606c7ec37f8f06ff7db5024e6 100644 (file)
--- a/units/user/meson.build
+++ b/units/user/meson.build
@@ -13,26 +13,14 @@ units = [
         'smartcard.target',
         'sockets.target',
         'sound.target',
-        'timers.target',
         'systemd-exit.service',
+        'systemd-tmpfiles-clean.service',
         'systemd-tmpfiles-clean.timer',
+        'systemd-tmpfiles-setup.service',
+        'timers.target',
 ]
 
 foreach file : units
         install_data(file,
                      install_dir : userunitdir)
 endforeach
-
-in_units = [
-        'systemd-tmpfiles-clean.service',
-        'systemd-tmpfiles-setup.service',
-]
-
-foreach file : in_units
-        gen = configure_file(
-                input : file + '.in',
-                output : file,
-                configuration : substs)
-        install_data(gen,
-                     install_dir : userunitdir)
-endforeach

diff --git a/units/user/systemd-tmpfiles-clean.service b/units/user/systemd-tmpfiles-clean.service
new file mode 100644 (file)
index 0000000..3be0de5
--- /dev/null
+++ b/units/user/systemd-tmpfiles-clean.service
@@ -0,0 +1,21 @@
+#  SPDX-License-Identifier: LGPL-2.1+
+#
+#  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.
+
+[Unit]
+Description=Cleanup of User's Temporary Files and Directories
+Documentation=man:tmpfiles.d(5) man:systemd-tmpfiles(8)
+DefaultDependencies=no
+Conflicts=shutdown.target
+Before=basic.target shutdown.target
+
+[Service]
+Type=oneshot
+ExecStart=systemd-tmpfiles --user --clean
+SuccessExitStatus=DATAERR
+IOSchedulingClass=idle

diff --git a/units/user/systemd-tmpfiles-clean.service.in b/units/user/systemd-tmpfiles-clean.service.in
deleted file mode 100644 (file)
index 306b064..0000000
--- a/units/user/systemd-tmpfiles-clean.service.in
+++ /dev/null
@@ -1,21 +0,0 @@
-#  SPDX-License-Identifier: LGPL-2.1+
-#
-#  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.
-
-[Unit]
-Description=Cleanup of User's Temporary Files and Directories
-Documentation=man:tmpfiles.d(5) man:systemd-tmpfiles(8)
-DefaultDependencies=no
-Conflicts=shutdown.target
-Before=basic.target shutdown.target
-
-[Service]
-Type=oneshot
-ExecStart=@rootbindir@/systemd-tmpfiles --user --clean
-SuccessExitStatus=DATAERR
-IOSchedulingClass=idle

diff --git a/units/user/systemd-tmpfiles-setup.service b/units/user/systemd-tmpfiles-setup.service
new file mode 100644 (file)
index 0000000..c4b29cb
--- /dev/null
+++ b/units/user/systemd-tmpfiles-setup.service
@@ -0,0 +1,25 @@
+#  SPDX-License-Identifier: LGPL-2.1+
+#
+#  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.
+
+[Unit]
+Description=Create User's Volatile Files and Directories
+Documentation=man:tmpfiles.d(5) man:systemd-tmpfiles(8)
+DefaultDependencies=no
+Conflicts=shutdown.target
+Before=basic.target shutdown.target
+RefuseManualStop=yes
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=systemd-tmpfiles --user --create --remove --boot
+SuccessExitStatus=DATAERR
+
+[Install]
+WantedBy=basic.target

diff --git a/units/user/systemd-tmpfiles-setup.service.in b/units/user/systemd-tmpfiles-setup.service.in
deleted file mode 100644 (file)
index a852ef5..0000000
--- a/units/user/systemd-tmpfiles-setup.service.in
+++ /dev/null
@@ -1,25 +0,0 @@
-#  SPDX-License-Identifier: LGPL-2.1+
-#
-#  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.
-
-[Unit]
-Description=Create User's Volatile Files and Directories
-Documentation=man:tmpfiles.d(5) man:systemd-tmpfiles(8)
-DefaultDependencies=no
-Conflicts=shutdown.target
-Before=basic.target shutdown.target
-RefuseManualStop=yes
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=@rootbindir@/systemd-tmpfiles --user --create --remove --boot
-SuccessExitStatus=DATAERR
-
-[Install]
-WantedBy=basic.target