#include <string.h>
#include <errno.h>
#include <unistd.h>
+#include <fcntl.h>
#include <libudev.h>
#include <dbus/dbus.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 void start_target(const char *target, bool isolate) {
DBusMessage *m = NULL, *reply = NULL;
DBusError error;
- const char *mode, *base_target = "base.target";
+ 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", "StartUnitReplace"))) {
log_error("Could not allocate message.");
/* Start these units only if we can replace base.target with it */
if (!dbus_message_append_args(m,
- DBUS_TYPE_STRING, &base_target,
+ 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[]) {
- const char *cmdline[7];
+ const char *cmdline[8];
int i = 0, r = EXIT_FAILURE, q;
pid_t pid;
siginfo_t status;
root_directory = false;
} else {
struct stat st;
+ struct timespec times[2];
/* Find root device */
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;
cmdline[i++] = "/sbin/fsck";
cmdline[i++] = "-a";
cmdline[i++] = "-T";
+ cmdline[i++] = "-l";
if (!root_directory)
cmdline[i++] = "-M";
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);
- 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_code == CLD_EXITED && (status.si_status & 1))
- touch("/dev/.systemd/quotacheck");
+ touch("/run/systemd/quotacheck");
finish:
if (udev_device)