chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Link against -lcap only where required
[elogind.git]
/
src
/
fsck.c
diff --git
a/src/fsck.c
b/src/fsck.c
index e13dcf4d9d975a95cfc46a4a86c13bb0f5f932e0..19ca75311ba50dbbfe20cadf81bbd12538e89f59 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>
@@
-31,6
+32,7
@@
#include "util.h"
#include "dbus-common.h"
#include "special.h"
#include "util.h"
#include "dbus-common.h"
#include "special.h"
+#include "bus-errors.h"
static bool arg_skip = false;
static bool arg_force = false;
static bool arg_skip = false;
static bool arg_force = false;
@@
-38,7
+40,7
@@
static bool arg_force = false;
static void start_target(const char *target, bool isolate) {
DBusMessage *m = NULL, *reply = NULL;
DBusError error;
static void start_target(const char *target, bool isolate) {
DBusMessage *m = NULL, *reply = NULL;
DBusError error;
- const char *mode, *bas
e_target = "base
.target";
+ const char *mode, *bas
ic_target = "basic
.target";
DBusConnection *bus = NULL;
assert(target);
DBusConnection *bus = NULL;
assert(target);
@@
-55,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.");
@@
-65,7
+67,7
@@
static void start_target(const char *target, bool isolate) {
/* Start these units only if we can replace base.target with it */
if (!dbus_message_append_args(m,
/* Start these units only if we can replace base.target with it */
if (!dbus_message_append_args(m,
- DBUS_TYPE_STRING, &bas
e
_target,
+ DBUS_TYPE_STRING, &bas
ic
_target,
DBUS_TYPE_STRING, &target,
DBUS_TYPE_STRING, &mode,
DBUS_TYPE_INVALID)) {
DBUS_TYPE_STRING, &target,
DBUS_TYPE_STRING, &mode,
DBUS_TYPE_INVALID)) {
@@
-74,7
+76,12
@@
static void start_target(const char *target, bool isolate) {
}
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
}
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
- log_error("Failed to start unit: %s", bus_error_message(&error));
+
+ /* Don't print a waring if we aren't called during
+ * startup */
+ if (!dbus_error_has_name(&error, BUS_ERROR_NO_SUCH_JOB))
+ log_error("Failed to start unit: %s", bus_error_message(&error));
+
goto finish;
}
goto finish;
}
@@
-99,6
+106,9
@@
static int parse_proc_cmdline(void) {
int r;
size_t l;
int r;
size_t l;
+ if (detect_container(NULL) > 0)
+ return 0;
+
if ((r = read_one_line_file("/proc/cmdline", &line)) < 0) {
log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
return 0;
if ((r = read_one_line_file("/proc/cmdline", &line)) < 0) {
log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
return 0;
@@
-114,7
+124,7
@@
static int parse_proc_cmdline(void) {
arg_skip = true;
else if (startswith(w, "fsck.mode"))
log_warning("Invalid fsck.mode= parameter. Ignoring.");
arg_skip = true;
else if (startswith(w, "fsck.mode"))
log_warning("Invalid fsck.mode= parameter. Ignoring.");
-#if
def TARGET_FEDORA
+#if
defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA)
else if (strneq(w, "fastboot", l))
arg_skip = true;
else if (strneq(w, "forcefsck", l))
else if (strneq(w, "fastboot", l))
arg_skip = true;
else if (strneq(w, "forcefsck", l))
@@
-164,6
+174,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 */
@@
-176,6
+187,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;
@@
-197,7
+216,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++] = "-
C
";
+ cmdline[i++] = "-
l
";
if (!root_directory)
cmdline[i++] = "-M";
if (!root_directory)
cmdline[i++] = "-M";
@@
-231,18
+250,22
@@
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;
if (status.si_code == CLD_EXITED && (status.si_status & 1))
} else
r = EXIT_SUCCESS;
if (status.si_code == CLD_EXITED && (status.si_status & 1))
- touch("/
dev/.
systemd/quotacheck");
+ touch("/
run/
systemd/quotacheck");
finish:
if (udev_device)
finish:
if (udev_device)