#include <string.h>
#include <errno.h>
#include <unistd.h>
+#include <fcntl.h>
+#include <libudev.h>
#include <dbus/dbus.h>
#include "util.h"
-#include "ac-power.h"
#include "dbus-common.h"
#include "special.h"
+#include "bus-errors.h"
static bool arg_skip = false;
static bool arg_force = false;
static void start_target(const char *target, bool isolate) {
DBusMessage *m = NULL, *reply = NULL;
DBusError error;
- const char *mode;
+ const char *mode, *basic_target = "basic.target";
DBusConnection *bus = NULL;
assert(target);
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", "StartUnit"))) {
+ if (!(m = dbus_message_new_method_call("org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", "StartUnitReplace"))) {
log_error("Could not allocate message.");
goto finish;
}
+ /* Start these units only if we can replace base.target with it */
+
if (!dbus_message_append_args(m,
+ DBUS_TYPE_STRING, &basic_target,
DBUS_TYPE_STRING, &target,
DBUS_TYPE_STRING, &mode,
DBUS_TYPE_INVALID)) {
}
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;
}
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;
arg_skip = true;
else if (startswith(w, "fsck.mode"))
log_warning("Invalid fsck.mode= parameter. Ignoring.");
-#ifdef TARGET_FEDORA
+#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA)
else if (strneq(w, "fastboot", l))
arg_skip = true;
else if (strneq(w, "forcefsck", l))
}
int main(int argc, char *argv[]) {
- static const char * cmdline[7];
+ const char *cmdline[8];
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;
+ bool root_directory;
- 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;
}
parse_proc_cmdline();
test_files();
- if (!arg_force) {
- if (arg_skip)
+ if (!arg_force && arg_skip)
+ return 0;
+
+ if (argc > 1) {
+ device = argv[1];
+ root_directory = false;
+ } else {
+ struct stat st;
+ struct timespec times[2];
+
+ /* 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;
- /* FIXME: only execute necessary fsck's if no AC power present */
- if (on_ac_power() == 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_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;
+ }
+
+ root_directory = true;
}
cmdline[i++] = "/sbin/fsck";
cmdline[i++] = "-a";
cmdline[i++] = "-T";
- cmdline[i++] = "-C";
+ cmdline[i++] = "-l";
+
+ if (!root_directory)
+ cmdline[i++] = "-M";
if (arg_force)
cmdline[i++] = "-f";
- cmdline[i++] = argv[1];
+ cmdline[i++] = device;
cmdline[i++] = NULL;
if ((pid = fork()) < 0) {
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;
-
- } else if (status.si_code != CLD_EXITED) {
- log_error("fsck failed due to unknown reason.");
- goto finish;
- }
-
- if (status.si_status & ~1) {
+ if (status.si_code != CLD_EXITED || (status.si_status & ~1)) {
- if (access("/dev/.systemd/late-fsck", F_OK) >= 0) {
+ 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);
- goto finish;
- }
+ else
+ log_error("fsck failed due to unknown reason.");
- if (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);
- else
+ else if (status.si_code == CLD_EXITED && (status.si_status & 6))
/* Some other problem */
start_target(SPECIAL_EMERGENCY_TARGET, true);
+ else {
+ r = EXIT_SUCCESS;
+ log_warning("Ignoring error.");
+ }
} else
r = EXIT_SUCCESS;
- if (status.si_status & 1)
- touch("/dev/.systemd/quotacheck");
+ if (status.si_code == CLD_EXITED && (status.si_status & 1))
+ touch("/run/systemd/quotacheck");
finish:
+ if (udev_device)
+ udev_device_unref(udev_device);
+
+ if (udev)
+ udev_unref(udev);
+
return r;
}
~ianmdlvl / elogind.git / blobdiff