chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
90bb85e
)
fsck: properly hook in fsck everywhere, add special support for fsck'ing root dir
author
Lennart Poettering
<lennart@poettering.net>
Tue, 19 Oct 2010 21:45:18 +0000
(23:45 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Tue, 19 Oct 2010 21:45:18 +0000
(23:45 +0200)
Makefile.am
patch
|
blob
|
history
src/automount.c
patch
|
blob
|
history
src/fsck.c
patch
|
blob
|
history
src/mount.c
patch
|
blob
|
history
src/quotacheck.c
patch
|
blob
|
history
src/special.h
patch
|
blob
|
history
units/remount-rootfs.service
patch
|
blob
|
history
units/sysinit.target.m4
patch
|
blob
|
history
units/systemd-update-utmp-runlevel.service.in
patch
|
blob
|
history
diff --git
a/Makefile.am
b/Makefile.am
index 92b1e2215927dc892c7316f61f51a0a57b226494..9417b139e1627937b3da0857402357d627e87776 100644
(file)
--- 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/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 \
nodist_systemunit_DATA = \
units/sysinit.target \
@@
-237,7
+239,9
@@
nodist_systemunit_DATA = \
units/halt.service \
units/poweroff.service \
units/reboot.service \
units/halt.service \
units/poweroff.service \
units/reboot.service \
- units/kexec.service
+ units/kexec.service \
+ units/fsck@.service \
+ units/fsck-root.service
dist_sessionunit_DATA = \
units/session/default.target \
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/reboot.service.in \
units/kexec.service.in \
units/session/exit.service.in \
+ units/fsck@.service.in \
+ units/fsck-root.service.in \
systemd.pc.in
if TARGET_FEDORA
systemd.pc.in
if TARGET_FEDORA
@@
-678,7
+684,6
@@
systemd_tmpfiles_LDADD = \
systemd_fsck_SOURCES = \
src/fsck.c \
systemd_fsck_SOURCES = \
src/fsck.c \
- src/ac-power.c \
src/dbus-common.c
systemd_fsck_CFLAGS = \
src/dbus-common.c
systemd_fsck_CFLAGS = \
diff --git
a/src/automount.c
b/src/automount.c
index f7bf7f32d400c4d06d87c5958453c1418c087752..c557b6ebb212050066461b455d6abda0ccfeb75e 100644
(file)
--- 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 (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;
}
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 b0c3620c8c3d3ddb89a1cd6eabad5ab65680252a..0e1508972e99a6f74158d14b875ff9e0b5b8f563 100644
(file)
--- a/
src/fsck.c
+++ b/
src/fsck.c
@@
-25,10
+25,10
@@
#include <errno.h>
#include <unistd.h>
#include <errno.h>
#include <unistd.h>
+#include <libudev.h>
#include <dbus/dbus.h>
#include "util.h"
#include <dbus/dbus.h>
#include "util.h"
-#include "ac-power.h"
#include "dbus-common.h"
#include "special.h"
#include "dbus-common.h"
#include "special.h"
@@
-135,13
+135,16
@@
static void test_files(void) {
}
int main(int argc, char *argv[]) {
}
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;
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;
}
return EXIT_FAILURE;
}
@@
-152,14
+155,38
@@
int main(int argc, char *argv[]) {
parse_proc_cmdline();
test_files();
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;
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";
if (arg_force)
cmdline[i++] = "-f";
- cmdline[i++] =
argv[1]
;
+ cmdline[i++] =
device
;
cmdline[i++] = NULL;
if ((pid = fork()) < 0) {
cmdline[i++] = NULL;
if ((pid = fork()) < 0) {
@@
-188,20
+215,16
@@
int main(int argc, char *argv[]) {
goto finish;
}
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
/* 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;
} else
r = EXIT_SUCCESS;
- if (status.si_
status & 1
)
+ if (status.si_
code == CLD_EXITED && (status.si_status & 1)
)
touch("/dev/.systemd/quotacheck");
finish:
touch("/dev/.systemd/quotacheck");
finish:
+ if (udev_device)
+ udev_device_unref(udev_device);
+
+ if (udev)
+ udev_unref(udev);
+
return r;
}
return r;
}
diff --git
a/src/mount.c
b/src/mount.c
index 284fcb94b2d179c82f9921cbe2752cf9df73febf..53edf9d560ea48834eda89a0cdbcbd0eb50ed44b 100644
(file)
--- 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 */
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;
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 (m->meta.manager->running_as == MANAGER_SYSTEM &&
!path_equal(m->where, "/")) {
- if ((r = unit_add_dependency_by_name(UNIT(m), UNIT_
AFTER, SPECIAL_FS
CK_TARGET, NULL, true)) < 0)
+ if ((r = unit_add_dependency_by_name(UNIT(m), UNIT_
BEFORE, SPECIAL_QUOTACHE
CK_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)
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 a579c5e8b713727cd9c7476dff17dd6b2c1aac0c..c7aaece984e199436f114cc6923da18a505647c6 100644
(file)
--- a/
src/quotacheck.c
+++ b/
src/quotacheck.c
@@
-91,7
+91,6
@@
int main(int argc, char *argv[]) {
test_files();
if (!arg_force) {
test_files();
if (!arg_force) {
-
if (arg_skip)
return 0;
if (arg_skip)
return 0;
diff --git
a/src/special.h
b/src/special.h
index 0b37353c90d81d1d63d11edca8a29c693ed9f5ab..6f15e6ecc6aac11cbe01d9cc6123a76318ca9a6c 100644
(file)
--- 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_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@.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"
#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 31deb82db3d89afbb8ca8b99c96809ada02fe44b..890f8fbca1f4a6220e36a1571b46aa699d974a0a 100644
(file)
--- a/
units/remount-rootfs.service
+++ b/
units/remount-rootfs.service
@@
-9,7
+9,7
@@
Description=Remount Root FS
DefaultDependencies=no
Conflicts=shutdown.target
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]
Before=local-fs.target shutdown.target
[Service]
diff --git
a/units/sysinit.target.m4
b/units/sysinit.target.m4
index e8d4d72b873316b4c51733065a69a09c7fce6ec3..08b035da24fd6233796edb562993e5a7cf38d8e2 100644
(file)
--- 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
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 0cbde37c2a7a13038543b660d41e45c585df8c96..23c5ada1eaf527399ac88bb4a2d003663fc042ba 100644
(file)
--- 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
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]
Before=poweroff.service reboot.service halt.service killall.service
[Service]