[systemd-commits] 5 commits - Makefile.am src/fsck.c TODO units/fedora units/systemd-readahead-replay.service.in
Lennart Poettering
lennart at kemper.freedesktop.org
Sat Oct 30 16:13:42 PDT 2010
Makefile.am | 10 ++++++----
TODO | 2 +-
src/fsck.c | 5 +++--
units/fedora/plymouth-halt.service | 1 -
units/fedora/plymouth-kexec.service | 1 -
units/fedora/plymouth-poweroff.service | 1 -
units/fedora/plymouth-read-write.service | 16 ++++++++++++++++
units/fedora/plymouth-reboot.service | 1 -
units/fedora/plymouth-start.service | 2 +-
units/systemd-readahead-replay.service.in | 1 +
10 files changed, 28 insertions(+), 12 deletions(-)
New commits:
commit 3370f947d6ec13bb4e21b6fa3ac8de0cd20d8466
Author: Lennart Poettering <lennart at poettering.net>
Date: Sun Oct 31 00:53:12 2010 +0200
readahead: shortcut replay if /.readahead doesn't exist
diff --git a/units/systemd-readahead-replay.service.in b/units/systemd-readahead-replay.service.in
index 026d3b0..8ed3b75 100644
--- a/units/systemd-readahead-replay.service.in
+++ b/units/systemd-readahead-replay.service.in
@@ -10,6 +10,7 @@ Description=Replay Read-Ahead Data
DefaultDependencies=no
Conflicts=shutdown.target
Before=basic.target shutdown.target
+ConditionPathExists=/.readahead
[Service]
Type=notify
commit 739aad5169731424ca49271903afa4148f0129f2
Author: Lennart Poettering <lennart at poettering.net>
Date: Sun Oct 31 00:52:35 2010 +0200
fedora: start plymouth after udev-settle, so that the graphics modules are loaded
diff --git a/TODO b/TODO
index b022165..cfe0e9f 100644
--- a/TODO
+++ b/TODO
@@ -70,7 +70,7 @@
* only add quotacheck deps to .mount units which mention grpquota/usrquota in the mount flags
-* make use of fsck -l
+* we now order plymouth after udev-trigger. Can we optimize this?
External:
diff --git a/units/fedora/plymouth-start.service b/units/fedora/plymouth-start.service
index af00724..8c0ba8b 100644
--- a/units/fedora/plymouth-start.service
+++ b/units/fedora/plymouth-start.service
@@ -8,7 +8,7 @@
[Unit]
Description=Show Plymouth Boot Screen
DefaultDependencies=no
-After=systemd-vconsole-setup.service
+After=systemd-vconsole-setup.service udev-settle.service
Before=systemd-ask-password-plymouth.service
[Service]
commit cf1a105550766d2251bc10240b6058a37babd600
Author: Lennart Poettering <lennart at poettering.net>
Date: Sun Oct 31 00:39:36 2010 +0200
fsck: add new -l switch to fsck mount options
diff --git a/src/fsck.c b/src/fsck.c
index 5574c0a..fdcf6b4 100644
--- a/src/fsck.c
+++ b/src/fsck.c
@@ -142,7 +142,7 @@ static void test_files(void) {
}
int main(int argc, char *argv[]) {
- const char *cmdline[7];
+ const char *cmdline[8];
int i = 0, r = EXIT_FAILURE, q;
pid_t pid;
siginfo_t status;
@@ -188,7 +188,7 @@ int main(int argc, char *argv[]) {
times[0] = st.st_atim;
times[1] = st.st_mtim;
if (utimensat(AT_FDCWD, "/", times, 0) == 0) {
- log_error("Root directory is writable, skip check.");
+ log_info("Root directory is writable, skipping check.");
return 0;
}
@@ -213,6 +213,7 @@ int main(int argc, char *argv[]) {
cmdline[i++] = "/sbin/fsck";
cmdline[i++] = "-a";
cmdline[i++] = "-T";
+ cmdline[i++] = "-l";
if (!root_directory)
cmdline[i++] = "-M";
commit 198b625ba70d4c0ff72c6bc9a110832bd028273d
Author: Lennart Poettering <lennart at poettering.net>
Date: Sat Oct 30 23:55:54 2010 +0200
units: add unit to call /bin/plymouth update-root-fs --read-write
diff --git a/Makefile.am b/Makefile.am
index 989514d..03a6a4e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -301,6 +301,7 @@ dist_systemunit_DATA += \
units/fedora/rc-local.service \
units/fedora/halt-local.service \
units/fedora/plymouth-start.service \
+ units/fedora/plymouth-read-write.service \
units/fedora/plymouth-quit.service \
units/fedora/plymouth-reboot.service \
units/fedora/plymouth-kexec.service \
@@ -1183,13 +1184,14 @@ if TARGET_FEDORA
( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
rm -f halt-local.service && \
$(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
- ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
- rm -f plymouth-quit.service && \
- $(LN_S) ../plymouth-quit.service plymouth-quit.service )
( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
- rm -f plymouth-start.service systemd-ask-password-plymouth.path && \
+ rm -f plymouth-start.service systemd-ask-password-plymouth.path plymouth-read-write.service && \
$(LN_S) ../plymouth-start.service plymouth-start.service && \
+ $(LN_S) ../plymouth-read-write.service plymouth-read-write.service && \
$(LN_S) ../systemd-ask-password-plymouth.path systemd-ask-password-plymouth.path )
+ ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
+ rm -f plymouth-quit.service && \
+ $(LN_S) ../plymouth-quit.service plymouth-quit.service )
( cd $(DESTDIR)$(systemunitdir)/reboot.target.wants && \
rm -f plymouth-reboot.service && \
$(LN_S) ../plymouth-reboot.service plymouth-reboot.service )
diff --git a/units/fedora/plymouth-read-write.service b/units/fedora/plymouth-read-write.service
new file mode 100644
index 0000000..ff2f8e4
--- /dev/null
+++ b/units/fedora/plymouth-read-write.service
@@ -0,0 +1,16 @@
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+[Unit]
+Description=Tell Plymouth To Write Out Runtime Data
+DefaultDependencies=no
+After=local-fs.target
+Before=basic.target
+
+[Service]
+ExecStart=-/bin/plymouth update-root-fs --read-write
+Type=oneshot
commit 5edf93ec94ff80edb795e561f2b5c1b7ab68a7d8
Author: Lennart Poettering <lennart at poettering.net>
Date: Fri Oct 29 17:07:01 2010 +0200
fedora: /bin/plymouth --sysinit is not necessary on shut down
diff --git a/units/fedora/plymouth-halt.service b/units/fedora/plymouth-halt.service
index 15ba220..fa1a20a 100644
--- a/units/fedora/plymouth-halt.service
+++ b/units/fedora/plymouth-halt.service
@@ -13,7 +13,6 @@ DefaultDependencies=no
[Service]
ExecStart=/sbin/plymouthd --mode=shutdown
-ExecStartPost=-/bin/plymouth --sysinit
ExecStartPost=-/bin/plymouth --show-splash
ExecStartPost=-/bin/plymouth message '--text=Halting...'
Type=forking
diff --git a/units/fedora/plymouth-kexec.service b/units/fedora/plymouth-kexec.service
index eb5cba8..61c6376 100644
--- a/units/fedora/plymouth-kexec.service
+++ b/units/fedora/plymouth-kexec.service
@@ -13,7 +13,6 @@ DefaultDependencies=no
[Service]
ExecStart=/sbin/plymouthd --mode=shutdown
-ExecStartPost=-/bin/plymouth --sysinit
ExecStartPost=-/bin/plymouth --show-splash
ExecStartPost=-/bin/plymouth message '--text=Rebooting with kexec...'
Type=forking
diff --git a/units/fedora/plymouth-poweroff.service b/units/fedora/plymouth-poweroff.service
index b73a446..c1eebb5 100644
--- a/units/fedora/plymouth-poweroff.service
+++ b/units/fedora/plymouth-poweroff.service
@@ -13,7 +13,6 @@ DefaultDependencies=no
[Service]
ExecStart=/sbin/plymouthd --mode=shutdown
-ExecStartPost=-/bin/plymouth --sysinit
ExecStartPost=-/bin/plymouth --show-splash
ExecStartPost=-/bin/plymouth message '--text=Powering Off...'
Type=forking
diff --git a/units/fedora/plymouth-reboot.service b/units/fedora/plymouth-reboot.service
index 900b640..974db31 100644
--- a/units/fedora/plymouth-reboot.service
+++ b/units/fedora/plymouth-reboot.service
@@ -13,7 +13,6 @@ DefaultDependencies=no
[Service]
ExecStart=/sbin/plymouthd --mode=shutdown
-ExecStartPost=-/bin/plymouth --sysinit
ExecStartPost=-/bin/plymouth --show-splash
ExecStartPost=-/bin/plymouth message '--text=Rebooting...'
Type=forking
More information about the systemd-commits
mailing list