systemd-fsck: always connect to systemd-fsckd

[elogind.git] / src / fsck / fsck.c

diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
index 6ccb2e7..9ecba99 100644 (file)
--- a/src/fsck/fsck.c
+++ b/src/fsck/fsck.c
@@ -45,7 +45,6 @@
 
 static bool arg_skip = false;
 static bool arg_force = false;
 
 static bool arg_skip = false;
 static bool arg_force = false;

-static bool arg_show_progress = false;

 static const char *arg_repair = "-a";
 
 static void start_target(const char *target) {
 static const char *arg_repair = "-a";
 
 static void start_target(const char *target) {


@@ -131,8 +130,6 @@ static void test_files(void) {
         }
 #endif
 
         }
 #endif
 

-        if (access("/run/systemd/show-status", F_OK) >= 0 || plymouth_running())
-                arg_show_progress = true;

 }
 
 static int process_progress(int fd, dev_t device_num) {
 }
 
 static int process_progress(int fd, dev_t device_num) {


@@ -286,11 +283,10 @@ int main(int argc, char *argv[]) {
                         log_warning_errno(r, "fsck.%s cannot be used for %s: %m", type, device);
         }
 
                         log_warning_errno(r, "fsck.%s cannot be used for %s: %m", type, device);
         }
 

-        if (arg_show_progress)
-                if (pipe(progress_pipe) < 0) {
-                        log_error_errno(errno, "pipe(): %m");
-                        return EXIT_FAILURE;
-                }
+        if (pipe(progress_pipe) < 0) {
+                log_error_errno(errno, "pipe(): %m");
+                return EXIT_FAILURE;
+        }

 
         cmdline[i++] = "/sbin/fsck";
         cmdline[i++] =  arg_repair;
 
         cmdline[i++] = "/sbin/fsck";
         cmdline[i++] =  arg_repair;