picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

units: upgrade initrd check Conditions to Asserts 

It's a bug if an initrd unit is run on the host. Hence let's upgrade the
conditions to asserts.
This commit is contained in:
Lennart Poettering 2020-07-29 16:25:59 +02:00
parent 0cfb490fe9
commit 78490efca3
10 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
units/initrd-cleanup.service
View File

@ -10,7 +10,7 @@
[Unit]
Description=Cleaning Up and Shutting Down Daemons
DefaultDependencies=no
ConditionPathExists=/etc/initrd-release
AssertPathExists=/etc/initrd-release
OnFailure=emergency.target
OnFailureJobMode=replace-irreversibly
After=initrd-root-fs.target initrd-fs.target initrd.target

2
units/initrd-fs.target
View File

@ -12,7 +12,7 @@ Description=Initrd File Systems
Documentation=man:systemd.special(7)
OnFailure=emergency.target
OnFailureJobMode=replace-irreversibly
ConditionPathExists=/etc/initrd-release
AssertPathExists=/etc/initrd-release
After=initrd-parse-etc.service
DefaultDependencies=no
Conflicts=shutdown.target

2
units/initrd-parse-etc.service
View File

@ -14,7 +14,7 @@ Requires=initrd-root-fs.target
After=initrd-root-fs.target
OnFailure=emergency.target
OnFailureJobMode=replace-irreversibly
ConditionPathExists=/etc/initrd-release
AssertPathExists=/etc/initrd-release
[Service]
Type=oneshot

2
units/initrd-root-device.target
View File

@ -10,7 +10,7 @@
[Unit]
Description=Initrd Root Device
Documentation=man:systemd.special(7)
ConditionPathExists=/etc/initrd-release
AssertPathExists=/etc/initrd-release
OnFailure=emergency.target
OnFailureJobMode=replace-irreversibly
DefaultDependencies=no

2
units/initrd-root-fs.target
View File

@ -10,7 +10,7 @@
[Unit]
Description=Initrd Root File System
Documentation=man:systemd.special(7)
ConditionPathExists=/etc/initrd-release
AssertPathExists=/etc/initrd-release
OnFailure=emergency.target
OnFailureJobMode=replace-irreversibly
DefaultDependencies=no

2
units/initrd-switch-root.service
View File

@ -10,7 +10,7 @@
[Unit]
Description=Switch Root
DefaultDependencies=no
ConditionPathExists=/etc/initrd-release
AssertPathExists=/etc/initrd-release
OnFailure=emergency.target
OnFailureJobMode=replace-irreversibly
AllowIsolate=yes

2
units/initrd-switch-root.target
View File

@ -9,7 +9,7 @@
[Unit]
Description=Switch Root
ConditionPathExists=/etc/initrd-release
AssertPathExists=/etc/initrd-release
DefaultDependencies=no
Requires=initrd-switch-root.service
Before=initrd-switch-root.service

2
units/initrd-udevadm-cleanup-db.service
View File

@ -10,7 +10,7 @@
[Unit]
Description=Cleanup udev Database
DefaultDependencies=no
ConditionPathExists=/etc/initrd-release
AssertPathExists=/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

2
units/initrd.target
View File

@ -12,7 +12,7 @@ Description=Initrd Default Target
Documentation=man:systemd.special(7)
OnFailure=emergency.target
OnFailureJobMode=replace-irreversibly
ConditionPathExists=/etc/initrd-release
AssertPathExists=/etc/initrd-release
Requires=basic.target
Wants=initrd-root-fs.target initrd-root-device.target initrd-fs.target initrd-parse-etc.service
After=initrd-root-fs.target initrd-root-device.target initrd-fs.target basic.target rescue.service rescue.target

2
units/systemd-hibernate-resume@.service.in
View File

@ -15,7 +15,7 @@ BindsTo=%i.device
Wants=local-fs-pre.target
After=%i.device
Before=local-fs-pre.target
ConditionPathExists=/etc/initrd-release
AssertPathExists=/etc/initrd-release
[Service]
Type=oneshot