diff options
| author | Ray Strode <rstrode@redhat.com> | 2012-07-26 13:05:22 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2012-07-26 13:05:22 -0400 |
| commit | c8e548d5e4266ce1583e5b532fe3a3559932d3be (patch) | |
| tree | f786f30749cae4e1a61df38e514cb874d796193d | |
| parent | d7b7e378e6721775b76a99add6a42533bbe0dbf5 (diff) | |
systemd: don't run read-write service from initrd
the initrd hits the local-fs.target as part of its normal
boot process. We used to use local-fs.target as a way of
knowing the system / is read-write. This no longer is a
valid mechanism.
This commit:
1) Stops installing plymouth-read-write service in the initrd
2) Makes it so if it does end up in the initrd it won't be
used
Related to fedora bug 830482
| -rwxr-xr-x | scripts/plymouth-populate-initrd.in | 2 | ||||
| -rw-r--r-- | systemd-units/plymouth-read-write.service.in | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/scripts/plymouth-populate-initrd.in b/scripts/plymouth-populate-initrd.in index 37ca3ec0..8d1eec00 100755 --- a/scripts/plymouth-populate-initrd.in +++ b/scripts/plymouth-populate-initrd.in @@ -417,7 +417,6 @@ if [ -n "$SYSTEMD_UNIT_DIR" -a -d "$SYSTEMD_UNIT_DIR" ]; then inst $SYSTEMD_UNIT_DIR/plymouth-switch-root.service $INITRDDIR inst $SYSTEMD_UNIT_DIR/plymouth-start.service $INITRDDIR - inst $SYSTEMD_UNIT_DIR/plymouth-read-write.service $INITRDDIR inst $SYSTEMD_UNIT_DIR/plymouth-quit.service $INITRDDIR inst $SYSTEMD_UNIT_DIR/plymouth-quit-wait.service $INITRDDIR inst $SYSTEMD_UNIT_DIR/plymouth-reboot.service $INITRDDIR @@ -427,7 +426,6 @@ if [ -n "$SYSTEMD_UNIT_DIR" -a -d "$SYSTEMD_UNIT_DIR" ]; then inst $SYSTEMD_UNIT_DIR/initrd-switch-root.target.wants/plymouth-switch-root.service $INITRDDIR inst $SYSTEMD_UNIT_DIR/sysinit.target.wants/plymouth-start.service $INITRDDIR - inst $SYSTEMD_UNIT_DIR/sysinit.target.wants/plymouth-read-write.service $INITRDDIR inst $SYSTEMD_UNIT_DIR/multi-user.target.wants/plymouth-quit.service $INITRDDIR inst $SYSTEMD_UNIT_DIR/multi-user.target.wants/plymouth-quit-wait.service $INITRDDIR inst $SYSTEMD_UNIT_DIR/reboot.target.wants/plymouth-reboot.service $INITRDDIR diff --git a/systemd-units/plymouth-read-write.service.in b/systemd-units/plymouth-read-write.service.in index b46d3f93..55b975ea 100644 --- a/systemd-units/plymouth-read-write.service.in +++ b/systemd-units/plymouth-read-write.service.in @@ -3,6 +3,7 @@ Description=Tell Plymouth To Write Out Runtime Data DefaultDependencies=no After=local-fs.target Before=sysinit.target +ConditionPathExists=!/etc/initrd-release [Service] ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth update-root-fs --read-write |