[systemd-commits] 2 commits - Makefile.am src/automount.c src/fsck.c src/mount.c src/quotacheck.c src/special.h units/remount-rootfs.service units/sysinit.target.m4 units/systemd-update-utmp-runlevel.service.in
Lennart Poettering
lennart at kemper.freedesktop.org
Tue Oct 19 14:47:20 PDT 2010
Makefile.am | 11 ++-
src/automount.c | 3 -
src/fsck.c | 78 ++++++++++++++++++--------
src/mount.c | 3 -
src/quotacheck.c | 1
src/special.h | 3 -
units/remount-rootfs.service | 2
units/sysinit.target.m4 | 6 --
units/systemd-update-utmp-runlevel.service.in | 2
9 files changed, 68 insertions(+), 41 deletions(-)
New commits:
commit 6e8ebcc7de321bac0ba494365a85a19040654405
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Oct 19 23:47:12 2010 +0200
fsck: make fsck idempotent
diff --git a/src/fsck.c b/src/fsck.c
index 0e15089..eca2212 100644
--- a/src/fsck.c
+++ b/src/fsck.c
@@ -135,7 +135,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;
@@ -194,6 +194,7 @@ int main(int argc, char *argv[]) {
cmdline[i++] = "-a";
cmdline[i++] = "-T";
cmdline[i++] = "-C";
+ cmdline[i++] = "-M";
if (arg_force)
cmdline[i++] = "-f";
commit a9e1f5ec36049dca715f83b2c6fc44a019e2da53
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Oct 19 23:45:18 2010 +0200
fsck: properly hook in fsck everywhere, add special support for fsck'ing root dir
diff --git a/Makefile.am b/Makefile.am
index 92b1e22..9417b13 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -207,7 +207,9 @@ dist_systemunit_DATA = \
units/bluetooth.target \
units/smartcard.target \
units/systemd-readahead-done.timer \
- units/systemd-tmpfiles-clean.timer
+ units/systemd-tmpfiles-clean.timer \
+ units/quotaon.service \
+ units/quotacheck.service
nodist_systemunit_DATA = \
units/sysinit.target \
@@ -237,7 +239,9 @@ nodist_systemunit_DATA = \
units/halt.service \
units/poweroff.service \
units/reboot.service \
- units/kexec.service
+ units/kexec.service \
+ units/fsck at .service \
+ units/fsck-root.service
dist_sessionunit_DATA = \
units/session/default.target \
@@ -277,6 +281,8 @@ EXTRA_DIST = \
units/reboot.service.in \
units/kexec.service.in \
units/session/exit.service.in \
+ units/fsck at .service.in \
+ units/fsck-root.service.in \
systemd.pc.in
if TARGET_FEDORA
@@ -678,7 +684,6 @@ systemd_tmpfiles_LDADD = \
systemd_fsck_SOURCES = \
src/fsck.c \
- src/ac-power.c \
src/dbus-common.c
systemd_fsck_CFLAGS = \
diff --git a/src/automount.c b/src/automount.c
index f7bf7f3..c557b6e 100644
--- a/src/automount.c
+++ b/src/automount.c
@@ -154,9 +154,6 @@ static int automount_add_default_dependencies(Automount *a) {
if (a->meta.manager->running_as == MANAGER_SYSTEM) {
- if ((r = unit_add_dependency_by_name(UNIT(a), UNIT_AFTER, SPECIAL_FSCK_TARGET, NULL, true)) < 0)
- return r;
-
if ((r = unit_add_two_dependencies_by_name(UNIT(a), UNIT_BEFORE, UNIT_CONFLICTED_BY, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0)
return r;
}
diff --git a/src/fsck.c b/src/fsck.c
index b0c3620..0e15089 100644
--- a/src/fsck.c
+++ b/src/fsck.c
@@ -25,10 +25,10 @@
#include <errno.h>
#include <unistd.h>
+#include <libudev.h>
#include <dbus/dbus.h>
#include "util.h"
-#include "ac-power.h"
#include "dbus-common.h"
#include "special.h"
@@ -135,13 +135,16 @@ static void test_files(void) {
}
int main(int argc, char *argv[]) {
- static const char * cmdline[7];
+ const char *cmdline[7];
int i = 0, r = EXIT_FAILURE, q;
pid_t pid;
siginfo_t status;
+ struct udev *udev = NULL;
+ struct udev_device *udev_device = NULL;
+ const char *device;
- if (argc != 2) {
- log_error("This program expects exactly one argument.");
+ if (argc > 2) {
+ log_error("This program expects one or no arguments.");
return EXIT_FAILURE;
}
@@ -152,14 +155,38 @@ int main(int argc, char *argv[]) {
parse_proc_cmdline();
test_files();
- if (!arg_force) {
- if (arg_skip)
- return 0;
+ if (!arg_force && arg_skip)
+ return 0;
+
+ if (argc > 1)
+ device = argv[1];
+ else {
+ struct stat st;
- /* FIXME: only execute necessary fsck's if no AC power present */
- if (on_ac_power() == 0) {
- log_info("Running on battery power, skipping file system check.");
+ /* Find root device */
+
+ if (stat("/", &st) < 0) {
+ log_error("Failed to stat() the root directory: %m");
+ goto finish;
+ }
+
+ /* Virtual root devices don't need an fsck */
+ if (major(st.st_dev) == 0)
return 0;
+
+ if (!(udev = udev_new())) {
+ log_error("Out of memory");
+ goto finish;
+ }
+
+ if (!(udev_device = udev_device_new_from_devnum(udev, 'b', st.st_dev))) {
+ log_error("Failed to detect root device.");
+ goto finish;
+ }
+
+ if (!(device = udev_device_get_devnode(udev_device))) {
+ log_error("Failed to detect device node of root directory.");
+ goto finish;
}
}
@@ -171,7 +198,7 @@ int main(int argc, char *argv[]) {
if (arg_force)
cmdline[i++] = "-f";
- cmdline[i++] = argv[1];
+ cmdline[i++] = device;
cmdline[i++] = NULL;
if ((pid = fork()) < 0) {
@@ -188,20 +215,16 @@ int main(int argc, char *argv[]) {
goto finish;
}
- if (status.si_code == CLD_KILLED ||
- status.si_code == CLD_DUMPED) {
- log_error("fsck terminated by signal %s.", signal_to_string(status.si_status));
- goto finish;
+ if (status.si_code != CLD_EXITED || (status.si_status & ~1)) {
- } else if (status.si_code != CLD_EXITED) {
- log_error("fsck failed due to unknown reason.");
- goto finish;
- }
-
- if (status.si_status & ~1) {
- log_error("fsck failed with error code %i.", status.si_status);
+ if (status.si_code == CLD_KILLED || status.si_code == CLD_DUMPED)
+ log_error("fsck terminated by signal %s.", signal_to_string(status.si_status));
+ else if (status.si_code == CLD_EXITED)
+ log_error("fsck failed with error code %i.", status.si_status);
+ else
+ log_error("fsck failed due to unknown reason.");
- if (status.si_status & 2)
+ if (status.si_code == CLD_EXITED && status.si_status & 2)
/* System should be rebooted. */
start_target(SPECIAL_REBOOT_TARGET, false);
else
@@ -211,9 +234,15 @@ int main(int argc, char *argv[]) {
} else
r = EXIT_SUCCESS;
- if (status.si_status & 1)
+ if (status.si_code == CLD_EXITED && (status.si_status & 1))
touch("/dev/.systemd/quotacheck");
finish:
+ if (udev_device)
+ udev_device_unref(udev_device);
+
+ if (udev)
+ udev_unref(udev);
+
return r;
}
diff --git a/src/mount.c b/src/mount.c
index 284fcb9..53edf9d 100644
--- a/src/mount.c
+++ b/src/mount.c
@@ -365,6 +365,7 @@ static int mount_add_device_links(Mount *m) {
Unit *fsck;
/* Let's add in the fsck service */
+ /* aka SPECIAL_FSCK_SERVICE */
if (!(name = unit_name_from_path_instance("fsck", p->what, ".service")))
return -ENOMEM;
@@ -393,7 +394,7 @@ static int mount_add_default_dependencies(Mount *m) {
if (m->meta.manager->running_as == MANAGER_SYSTEM &&
!path_equal(m->where, "/")) {
- if ((r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, SPECIAL_FSCK_TARGET, NULL, true)) < 0)
+ if ((r = unit_add_dependency_by_name(UNIT(m), UNIT_BEFORE, SPECIAL_QUOTACHECK_TARGET, NULL, true)) < 0)
return r;
if ((r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_BEFORE, UNIT_CONFLICTED_BY, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0)
diff --git a/src/quotacheck.c b/src/quotacheck.c
index a579c5e..c7aaece 100644
--- a/src/quotacheck.c
+++ b/src/quotacheck.c
@@ -91,7 +91,6 @@ int main(int argc, char *argv[]) {
test_files();
if (!arg_force) {
-
if (arg_skip)
return 0;
diff --git a/src/special.h b/src/special.h
index 0b37353..6f15e6e 100644
--- a/src/special.h
+++ b/src/special.h
@@ -52,7 +52,8 @@
#define SPECIAL_BASIC_TARGET "basic.target"
#define SPECIAL_SOCKETS_TARGET "sockets.target"
#define SPECIAL_SYSINIT_TARGET "sysinit.target"
-#define SPECIAL_FSCK_TARGET "fsck.target"
+#define SPECIAL_FSCK_SERVICE "fsck at .service"
+#define SPECIAL_QUOTACHECK_TARGET "quotacheck.target"
#define SPECIAL_RESCUE_TARGET "rescue.target"
#define SPECIAL_EXIT_TARGET "exit.target"
#define SPECIAL_EMERGENCY_TARGET "emergency.target"
diff --git a/units/remount-rootfs.service b/units/remount-rootfs.service
index 31deb82..890f8fb 100644
--- a/units/remount-rootfs.service
+++ b/units/remount-rootfs.service
@@ -9,7 +9,7 @@
Description=Remount Root FS
DefaultDependencies=no
Conflicts=shutdown.target
-After=systemd-readahead-collect.service systemd-readahead-replay.service fsck.target
+After=systemd-readahead-collect.service systemd-readahead-replay.service
Before=local-fs.target shutdown.target
[Service]
diff --git a/units/sysinit.target.m4 b/units/sysinit.target.m4
index e8d4d72..08b035d 100644
--- a/units/sysinit.target.m4
+++ b/units/sysinit.target.m4
@@ -23,9 +23,3 @@ m4_dnl Hook in Arch's /etc/rc.sysinit
Requires=sysinit.service
After=sysinit.service
)m4_dnl
-m4_ifdef(`TARGET_SUSE',`',
-m4_ifdef(`TARGET_DEBIAN',`',
-m4_dnl On Suse and Debian fsck.target is separate, everywhere else it is just an alias for sysinit.target
-Names=fsck.target
-)m4_dnl
-)m4_dnl
diff --git a/units/systemd-update-utmp-runlevel.service.in b/units/systemd-update-utmp-runlevel.service.in
index 0cbde37..23c5ada 100644
--- a/units/systemd-update-utmp-runlevel.service.in
+++ b/units/systemd-update-utmp-runlevel.service.in
@@ -9,7 +9,7 @@
Description=Notify Audit System and Update UTMP about System Runlevel Changes
DefaultDependencies=no
Wants=local-fs.target sysinit.target
-After=local-fs.target sysinit.target auditd.service runlevel1.target runlevel2.target runlevel3.target runlevel4.target runlevel5.target
+After=local-fs.target sysinit.target auditd.service runlevel1.target runlevel2.target runlevel3.target runlevel4.target runlevel5.target systemd-tmpfiles-setup.service
Before=poweroff.service reboot.service halt.service killall.service
[Service]
More information about the systemd-commits
mailing list