[systemd-commits] src/main.c TODO units/fsck-root.service.in units/plymouth-start.service

[Lennart Poettering]

 TODO                         |    8 +++-----
 src/main.c                   |    2 +-
 units/fsck-root.service.in   |    2 +-
 units/plymouth-start.service |    2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)

New commits:
commit 7d640cdf66a7c032c871ccfe0ee4ad56f7e3869b
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Mar 11 01:06:53 2011 +0100

    units: move the last flag files to /dev/.run

diff --git a/TODO b/TODO
index daa9677..6404719 100644
--- a/TODO
+++ b/TODO
@@ -6,19 +6,17 @@ F15:
 
 * isolate multi-user.target doesn't start a getty at tty1 if we run it from graphical.target
 
-* NFS, networkmanager ordering issue
+* NFS, networkmanager ordering issue (PENDING)
 
 * add fstab fields to add wait timeouts, change Wants to Requires by local-fs.target
 
 * hook emergency.target into local-fs.target in some way as OnFailure with isolate
 
-* mount /dev/.run and /var/run as bind mounts
-
-* drop SIGHUP handling from rsyslog.service upstream
+* drop SIGHUP handling from rsyslog.service upstream (PENDING)
 
 * teach dbus to activate all services it finds in /etc/systemd/services/org-*.service
 
-* save/restore tool for SysV as requested by FPC
+* save/restore tool for SysV as requested by FPC (PENDING)
 
 * bind mounts are ignored
 
diff --git a/src/main.c b/src/main.c
index 5d37f80..54ebb0b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1051,7 +1051,7 @@ int main(int argc, char *argv[]) {
 
         /* If Plymouth is being run make sure we show the status, so
          * that there's something nice to see when people press Esc */
-        if (access("/dev/.systemd/plymouth", F_OK) >= 0)
+        if (access("/dev/.run/initramfs/plymouth", F_OK) >= 0)
                 arg_show_status = true;
 
         if (arg_action == ACTION_HELP) {
diff --git a/units/fsck-root.service.in b/units/fsck-root.service.in
index 290c845..ae6ea92 100644
--- a/units/fsck-root.service.in
+++ b/units/fsck-root.service.in
@@ -12,7 +12,7 @@ After=systemd-readahead-collect.service systemd-readahead-replay.service
 Before=local-fs.target shutdown.target remount-rootfs.service quotacheck.service
 
 # Dracut informs us with this flag file if the root fsck was already run
-ConditionPathExists=!/dev/.initramfs/fsck
+ConditionPathExists=!/dev/.run/initramfs/root-fsck
 
 [Service]
 Type=oneshot
diff --git a/units/plymouth-start.service b/units/plymouth-start.service
index c3c101e..4ef2bcc 100644
--- a/units/plymouth-start.service
+++ b/units/plymouth-start.service
@@ -13,7 +13,7 @@ After=systemd-vconsole-setup.service udev-settle.service
 Before=systemd-ask-password-plymouth.service
 
 # Dracut informs us with this flag file if plymouth is already running
-ConditionPathExists=!/dev/.systemd/plymouth
+ConditionPathExists=!/dev/.run/initramfs/plymouth
 
 [Service]
 ExecStart=/sbin/plymouthd --mode=boot