X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ffsck.c;h=fdcf6b43c5d08335a650f7a0a713f3d3068aa945;hb=550c4dcc4184d5c4d55d3786b66797e5fb99c30a;hp=bfa35f2e56958a5f28c89e5b7be6c09142574227;hpb=70f12d37087721089a150fad985f0dca0f8af277;p=elogind.git

diff --git a/src/fsck.c b/src/fsck.c
index bfa35f2e5..fdcf6b43c 100644
--- a/src/fsck.c
+++ b/src/fsck.c
@@ -24,6 +24,7 @@
 #include <string.h>
 #include <errno.h>
 #include <unistd.h>
+#include <fcntl.h>
 
 #include <libudev.h>
 #include <dbus/dbus.h>
@@ -141,7 +142,7 @@ static void test_files(void) {
 }
 
 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;
@@ -170,6 +171,7 @@ int main(int argc, char *argv[]) {
                 root_directory = false;
         } else {
                 struct stat st;
+                struct timespec times[2];
 
                 /* Find root device */
 
@@ -182,6 +184,14 @@ int main(int argc, char *argv[]) {
                 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;
@@ -203,6 +213,7 @@ int main(int argc, char *argv[]) {
         cmdline[i++] = "/sbin/fsck";
         cmdline[i++] = "-a";
         cmdline[i++] = "-T";
+        cmdline[i++] = "-l";
 
         if (!root_directory)
                 cmdline[i++] = "-M";