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

diff --git a/scripts/plymouth-populate-initrd.in b/scripts/plymouth-populate-initrd.in
index 37ca3ec09efb63546c528213d782aa455bdee35c..8d1eec00ed63b146eea86796115221a0f3ba0e1f 100755 (executable)
--- 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 b46d3f9325dc81ee8f9d5a54f375944c531e6f35..55b975eaffd9debd76d71bfbab6dc332aaaf28c9 100644 (file)
--- 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