fsck: add new -l switch to fsck mount options

[elogind.git] / src / fsck.c

diff --git a/src/fsck.c b/src/fsck.c
index 96dea660a9be5871c94ceff09b625f3130d7f6bd..fdcf6b43c5d08335a650f7a0a713f3d3068aa945 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>


@@ -39,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, *base_target = "base.target";
+        const char *mode, *basic_target = "basic.target";

         DBusConnection *bus = NULL;
 
         assert(target);
         DBusConnection *bus = NULL;
 
         assert(target);


@@ -66,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, &base_target,
+                                      DBUS_TYPE_STRING, &basic_target,

                                       DBUS_TYPE_STRING, &target,
                                       DBUS_TYPE_STRING, &mode,
                                       DBUS_TYPE_INVALID)) {
                                       DBUS_TYPE_STRING, &target,
                                       DBUS_TYPE_STRING, &mode,
                                       DBUS_TYPE_INVALID)) {


@@ -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";