chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
plymouth: don't wait forever for plymouth in case it is stuck
[elogind.git]
/
src
/
fsck.c
diff --git
a/src/fsck.c
b/src/fsck.c
index bfa35f2e56958a5f28c89e5b7be6c09142574227..7855f3ac071cd0d094065deab2ce135f36bb56ff 100644
(file)
--- a/
src/fsck.c
+++ b/
src/fsck.c
@@
-24,6
+24,7
@@
#include <string.h>
#include <errno.h>
#include <unistd.h>
#include <string.h>
#include <errno.h>
#include <unistd.h>
+#include <fcntl.h>
#include <libudev.h>
#include <dbus/dbus.h>
#include <libudev.h>
#include <dbus/dbus.h>
@@
-56,7
+57,7
@@
static void start_target(const char *target, bool isolate) {
else
mode = "replace";
else
mode = "replace";
- log_
debug
("Running request %s/start/%s", target, mode);
+ log_
info
("Running request %s/start/%s", target, mode);
if (!(m = dbus_message_new_method_call("org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", "StartUnitReplace"))) {
log_error("Could not allocate message.");
if (!(m = dbus_message_new_method_call("org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", "StartUnitReplace"))) {
log_error("Could not allocate message.");
@@
-141,7
+142,7
@@
static void test_files(void) {
}
int main(int argc, char *argv[]) {
}
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;
int i = 0, r = EXIT_FAILURE, q;
pid_t pid;
siginfo_t status;
@@
-170,6
+171,7
@@
int main(int argc, char *argv[]) {
root_directory = false;
} else {
struct stat st;
root_directory = false;
} else {
struct stat st;
+ struct timespec times[2];
/* Find root device */
/* Find root device */
@@
-182,6
+184,14
@@
int main(int argc, char *argv[]) {
if (major(st.st_dev) == 0)
return 0;
if (major(st.st_dev) == 0)
return 0;
+ /* check if we are already writable */
+ times[0] = st.st_atim;
+ times[1] = st.st_mtim;
+ if (utimensat(AT_FDCWD, "/", times, 0) == 0) {
+ log_info("Root directory is writable, skipping check.");
+ return 0;
+ }
+
if (!(udev = udev_new())) {
log_error("Out of memory");
goto finish;
if (!(udev = udev_new())) {
log_error("Out of memory");
goto finish;
@@
-203,6
+213,7
@@
int main(int argc, char *argv[]) {
cmdline[i++] = "/sbin/fsck";
cmdline[i++] = "-a";
cmdline[i++] = "-T";
cmdline[i++] = "/sbin/fsck";
cmdline[i++] = "-a";
cmdline[i++] = "-T";
+ cmdline[i++] = "-l";
if (!root_directory)
cmdline[i++] = "-M";
if (!root_directory)
cmdline[i++] = "-M";
@@
-236,12
+247,16
@@
int main(int argc, char *argv[]) {
else
log_error("fsck failed due to unknown reason.");
else
log_error("fsck failed due to unknown reason.");
- if (status.si_code == CLD_EXITED &&
status.si_status & 2
)
+ if (status.si_code == CLD_EXITED &&
(status.si_status & 2) && root_directory
)
/* System should be rebooted. */
start_target(SPECIAL_REBOOT_TARGET, false);
/* System should be rebooted. */
start_target(SPECIAL_REBOOT_TARGET, false);
- else
+ else
if (status.si_code == CLD_EXITED && (status.si_status & 6))
/* Some other problem */
start_target(SPECIAL_EMERGENCY_TARGET, true);
/* Some other problem */
start_target(SPECIAL_EMERGENCY_TARGET, true);
+ else {
+ r = EXIT_SUCCESS;
+ log_warning("Ignoring error.");
+ }
} else
r = EXIT_SUCCESS;
} else
r = EXIT_SUCCESS;