chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fsck: Search for fsck.type in PATH
[elogind.git]
/
src
/
fsck
/
fsck.c
diff --git
a/src/fsck/fsck.c
b/src/fsck/fsck.c
index 3164d6899c6c6e84888160318206828522c55b31..5ed837dffbeb58a545e926afba4485b2c6963bef 100644
(file)
--- a/
src/fsck/fsck.c
+++ b/
src/fsck/fsck.c
@@
-35,17
+35,17
@@
#include "bus-util.h"
#include "bus-error.h"
#include "bus-errors.h"
#include "bus-util.h"
#include "bus-error.h"
#include "bus-errors.h"
-#include "virt.h"
#include "fileio.h"
#include "udev-util.h"
#include "fileio.h"
#include "udev-util.h"
+#include "path-util.h"
static bool arg_skip = false;
static bool arg_force = false;
static bool arg_show_progress = false;
static void start_target(const char *target) {
static bool arg_skip = false;
static bool arg_force = false;
static bool arg_show_progress = false;
static void start_target(const char *target) {
- _cleanup_bus_unref_ sd_bus *bus = NULL;
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+ _cleanup_bus_unref_ sd_bus *bus = NULL;
int r;
assert(target);
int r;
assert(target);
@@
-67,53
+67,36
@@
static void start_target(const char *target) {
&error,
NULL,
"sss", "basic.target", target, "replace");
&error,
NULL,
"sss", "basic.target", target, "replace");
- if (r < 0) {
-
- /* Don't print a warning if we aren't called during
- * startup */
- if (!sd_bus_error_has_name(&error, BUS_ERROR_NO_SUCH_JOB))
- log_error("Failed to start unit: %s", bus_error_message(&error, -r));
- }
- return;
+ /* Don't print a warning if we aren't called during startup */
+ if (r < 0 && !sd_bus_error_has_name(&error, BUS_ERROR_NO_SUCH_JOB))
+ log_error("Failed to start unit: %s", bus_error_message(&error, -r));
}
}
-static int parse_proc_cmdline(void) {
- char *line, *w, *state;
- int r;
- size_t l;
+static int parse_proc_cmdline_item(const char *key, const char *value) {
- if (detect_container(NULL) > 0)
- return 0;
+ if (streq(key, "fsck.mode") && value) {
- r = read_one_line_file("/proc/cmdline", &line);
- if (r < 0) {
- log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
- return 0;
- }
-
- FOREACH_WORD_QUOTED(w, l, line, state) {
-
- if (strneq(w, "fsck.mode=auto", l))
+ if (streq(value, "auto"))
arg_force = arg_skip = false;
arg_force = arg_skip = false;
- else if (str
neq(w, "fsck.mode=force", l
))
+ else if (str
eq(value, "force"
))
arg_force = true;
arg_force = true;
- else if (str
neq(w, "fsck.mode=skip", l
))
+ else if (str
eq(value, "skip"
))
arg_skip = true;
arg_skip = true;
- else if (startswith(w, "fsck"))
- log_warning("Invalid fsck parameter. Ignoring.");
+ else
+ log_warning("Invalid fsck.mode= parameter. Ignoring.");
+ } else if (startswith(key, "fsck."))
+ log_warning("Invalid fsck parameter. Ignoring.");
#ifdef HAVE_SYSV_COMPAT
#ifdef HAVE_SYSV_COMPAT
- else if (strneq(w, "fastboot", l)) {
- log_error("Please pass 'fsck.mode=skip' rather than 'fastboot' on the kernel command line.");
- arg_skip = true;
- } else if (strneq(w, "forcefsck", l)) {
- log_error("Please pass 'fsck.mode=force' rather than 'forcefsck' on the kernel command line.");
- arg_force = true;
- }
-#endif
+ else if (streq(key, "fastboot") && !value) {
+ log_warning("Please pass 'fsck.mode=skip' rather than 'fastboot' on the kernel command line.");
+ arg_skip = true;
+ } else if (streq(key, "forcefsck") && !value) {
+ log_warning("Please pass 'fsck.mode=force' rather than 'forcefsck' on the kernel command line.");
+ arg_force = true;
}
}
+#endif
- free(line);
return 0;
}
return 0;
}
@@
-153,27
+136,25
@@
static double percent(int pass, unsigned long cur, unsigned long max) {
}
static int process_progress(int fd) {
}
static int process_progress(int fd) {
-
FILE *f, *console
;
+
_cleanup_fclose_ FILE *console = NULL, *f = NULL
;
usec_t last = 0;
bool locked = false;
int clear = 0;
f = fdopen(fd, "r");
if (!f) {
usec_t last = 0;
bool locked = false;
int clear = 0;
f = fdopen(fd, "r");
if (!f) {
-
close_nointr_nofail
(fd);
+
safe_close
(fd);
return -errno;
}
return -errno;
}
- console = fopen("/dev/console", "w");
- if (!console) {
- fclose(f);
+ console = fopen("/dev/console", "we");
+ if (!console)
return -ENOMEM;
return -ENOMEM;
- }
while (!feof(f)) {
int pass, m;
unsigned long cur, max;
while (!feof(f)) {
int pass, m;
unsigned long cur, max;
-
char *device
;
+
_cleanup_free_ char *device = NULL
;
double p;
usec_t t;
double p;
usec_t t;
@@
-182,20
+163,16
@@
static int process_progress(int fd) {
/* Only show one progress counter at max */
if (!locked) {
/* Only show one progress counter at max */
if (!locked) {
- if (flock(fileno(console), LOCK_EX|LOCK_NB) < 0) {
- free(device);
+ if (flock(fileno(console), LOCK_EX|LOCK_NB) < 0)
continue;
continue;
- }
locked = true;
}
/* Only update once every 50ms */
t = now(CLOCK_MONOTONIC);
locked = true;
}
/* Only update once every 50ms */
t = now(CLOCK_MONOTONIC);
- if (last + 50 * USEC_PER_MSEC > t) {
- free(device);
+ if (last + 50 * USEC_PER_MSEC > t)
continue;
continue;
- }
last = t;
last = t;
@@
-203,8
+180,6
@@
static int process_progress(int fd) {
fprintf(console, "\r%s: fsck %3.1f%% complete...\r%n", device, p, &m);
fflush(console);
fprintf(console, "\r%s: fsck %3.1f%% complete...\r%n", device, p, &m);
fflush(console);
- free(device);
-
if (m > clear)
clear = m;
}
if (m > clear)
clear = m;
}
@@
-219,8
+194,6
@@
static int process_progress(int fd) {
fflush(console);
}
fflush(console);
}
- fclose(f);
- fclose(console);
return 0;
}
return 0;
}
@@
-231,10
+204,11
@@
int main(int argc, char *argv[]) {
siginfo_t status;
_cleanup_udev_unref_ struct udev *udev = NULL;
_cleanup_udev_device_unref_ struct udev_device *udev_device = NULL;
siginfo_t status;
_cleanup_udev_unref_ struct udev *udev = NULL;
_cleanup_udev_device_unref_ struct udev_device *udev_device = NULL;
- const char *device;
+ const char *device
, *type
;
bool root_directory;
int progress_pipe[2] = { -1, -1 };
char dash_c[2+10+1];
bool root_directory;
int progress_pipe[2] = { -1, -1 };
char dash_c[2+10+1];
+ struct stat st;
if (argc > 2) {
log_error("This program expects one or no arguments.");
if (argc > 2) {
log_error("This program expects one or no arguments.");
@@
-247,60
+221,85
@@
int main(int argc, char *argv[]) {
umask(0022);
umask(0022);
- parse_proc_cmdline();
+ parse_proc_cmdline(
parse_proc_cmdline_item
);
test_files();
if (!arg_force && arg_skip)
return 0;
test_files();
if (!arg_force && arg_skip)
return 0;
+ udev = udev_new();
+ if (!udev) {
+ log_oom();
+ return EXIT_FAILURE;
+ }
+
if (argc > 1) {
device = argv[1];
root_directory = false;
if (argc > 1) {
device = argv[1];
root_directory = false;
+
+ if (stat(device, &st) < 0) {
+ log_error("Failed to stat '%s': %m", device);
+ return EXIT_FAILURE;
+ }
+
+ udev_device = udev_device_new_from_devnum(udev, 'b', st.st_rdev);
+ if (!udev_device) {
+ log_error("Failed to detect device %s", device);
+ return EXIT_FAILURE;
+ }
} else {
} else {
- struct stat st;
struct timespec times[2];
/* Find root device */
if (stat("/", &st) < 0) {
log_error("Failed to stat() the root directory: %m");
struct timespec times[2];
/* Find root device */
if (stat("/", &st) < 0) {
log_error("Failed to stat() the root directory: %m");
-
goto finish
;
+
return EXIT_FAILURE
;
}
/* Virtual root devices don't need an fsck */
if (major(st.st_dev) == 0)
}
/* Virtual root devices don't need an fsck */
if (major(st.st_dev) == 0)
- return
0
;
+ return
EXIT_SUCCESS
;
/* 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.");
/* 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
;
+ return
EXIT_SUCCESS
;
}
}
- if (!(udev = udev_new())) {
- log_oom();
- goto finish;
- }
-
- if (!(udev_device = udev_device_new_from_devnum(udev, 'b', st.st_dev))) {
+ udev_device = udev_device_new_from_devnum(udev, 'b', st.st_dev);
+ if (!udev_device) {
log_error("Failed to detect root device.");
log_error("Failed to detect root device.");
-
goto finish
;
+
return EXIT_FAILURE
;
}
}
- if (!(device = udev_device_get_devnode(udev_device))) {
+ device = udev_device_get_devnode(udev_device);
+ if (!device) {
log_error("Failed to detect device node of root directory.");
log_error("Failed to detect device node of root directory.");
-
goto finish
;
+
return EXIT_FAILURE
;
}
root_directory = true;
}
}
root_directory = true;
}
+ type = udev_device_get_property_value(udev_device, "ID_FS_TYPE");
+ if (type) {
+ r = fsck_exists(type);
+ if (r < 0) {
+ if (r == -ENOENT) {
+ log_info("fsck.%s doesn't exist, not checking file system.", type);
+ return EXIT_SUCCESS;
+ } else
+ log_warning("fsck.%s cannot be used: %s", type, strerror(-r));
+ }
+ }
+
if (arg_show_progress)
if (pipe(progress_pipe) < 0) {
log_error("pipe(): %m");
if (arg_show_progress)
if (pipe(progress_pipe) < 0) {
log_error("pipe(): %m");
-
goto finish
;
+
return EXIT_FAILURE
;
}
cmdline[i++] = "/sbin/fsck";
}
cmdline[i++] = "/sbin/fsck";
@@
-330,15
+329,12
@@
int main(int argc, char *argv[]) {
} else if (pid == 0) {
/* Child */
if (progress_pipe[0] >= 0)
} else if (pid == 0) {
/* Child */
if (progress_pipe[0] >= 0)
-
close_nointr_nofail
(progress_pipe[0]);
+
safe_close
(progress_pipe[0]);
execv(cmdline[0], (char**) cmdline);
_exit(8); /* Operational error */
}
execv(cmdline[0], (char**) cmdline);
_exit(8); /* Operational error */
}
- if (progress_pipe[1] >= 0) {
- close_nointr_nofail(progress_pipe[1]);
- progress_pipe[1] = -1;
- }
+ progress_pipe[1] = safe_close(progress_pipe[1]);
if (progress_pipe[0] >= 0) {
process_progress(progress_pipe[0]);
if (progress_pipe[0] >= 0) {
process_progress(progress_pipe[0]);
@@
-378,7
+374,7
@@
int main(int argc, char *argv[]) {
touch("/run/systemd/quotacheck");
finish:
touch("/run/systemd/quotacheck");
finish:
-
close_pipe
(progress_pipe);
+
safe_close_pair
(progress_pipe);
return r;
}
return r;
}