#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);
/* 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 main(int argc, char *argv[]) {
- const char *cmdline[8];
+ const char *cmdline[7];
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 one or no arguments.");
if (!arg_force && arg_skip)
return 0;
- if (argc > 1)
+ if (argc > 1) {
device = argv[1];
- else {
+ 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;
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++] = "-M";
+
+ if (!root_directory)
+ cmdline[i++] = "-M";
if (arg_force)
cmdline[i++] = "-f";