chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
missing: define correct syscall numbers for memfd_create() and getrandom() on aarch64
[elogind.git]
/
src
/
fsck
/
fsck.c
diff --git
a/src/fsck/fsck.c
b/src/fsck/fsck.c
index f5158735fa54835cd56791769d71353cc05ededc..20b794094835c0f5c3a988694ca1fb084fbd08cd 100644
(file)
--- a/
src/fsck/fsck.c
+++ b/
src/fsck/fsck.c
@@
-35,7
+35,7
@@
#include "special.h"
#include "bus-util.h"
#include "bus-error.h"
#include "special.h"
#include "bus-util.h"
#include "bus-error.h"
-#include "bus-errors.h"
+#include "bus-
common-
errors.h"
#include "fileio.h"
#include "udev-util.h"
#include "path-util.h"
#include "fileio.h"
#include "udev-util.h"
#include "path-util.h"
@@
-54,7
+54,7
@@
static void start_target(const char *target) {
r = bus_open_system_systemd(&bus);
if (r < 0) {
r = bus_open_system_systemd(&bus);
if (r < 0) {
- log_error_errno(
-
r, "Failed to get D-Bus connection: %m");
+ log_error_errno(r, "Failed to get D-Bus connection: %m");
return;
}
return;
}
@@
-238,7
+238,7
@@
int main(int argc, char *argv[]) {
q = parse_proc_cmdline(parse_proc_cmdline_item);
if (q < 0)
q = parse_proc_cmdline(parse_proc_cmdline_item);
if (q < 0)
- log_warning_errno(
-
q, "Failed to parse kernel command line, ignoring: %m");
+ log_warning_errno(q, "Failed to parse kernel command line, ignoring: %m");
test_files();
test_files();
@@
-256,7
+256,7
@@
int main(int argc, char *argv[]) {
root_directory = false;
if (stat(device, &st) < 0) {
root_directory = false;
if (stat(device, &st) < 0) {
- log_error
(
"Failed to stat '%s': %m", device);
+ log_error
_errno(errno,
"Failed to stat '%s': %m", device);
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}
@@
-271,7
+271,7
@@
int main(int argc, char *argv[]) {
/* Find root device */
if (stat("/", &st) < 0) {
/* Find root device */
if (stat("/", &st) < 0) {
- log_error
(
"Failed to stat() the root directory: %m");
+ log_error
_errno(errno,
"Failed to stat() the root directory: %m");
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}
@@
-309,12
+309,12
@@
int main(int argc, char *argv[]) {
log_info("fsck.%s doesn't exist, not checking file system on %s", type, device);
return EXIT_SUCCESS;
} else if (r < 0)
log_info("fsck.%s doesn't exist, not checking file system on %s", type, device);
return EXIT_SUCCESS;
} else if (r < 0)
- 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) {
}
if (arg_show_progress)
if (pipe(progress_pipe) < 0) {
- log_error
(
"pipe(): %m");
+ log_error
_errno(errno,
"pipe(): %m");
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}
@@
-346,7
+346,7
@@
int main(int argc, char *argv[]) {
pid = fork();
if (pid < 0) {
pid = fork();
if (pid < 0) {
- log_error
(
"fork(): %m");
+ log_error
_errno(errno,
"fork(): %m");
goto finish;
} else if (pid == 0) {
/* Child */
goto finish;
} else if (pid == 0) {
/* Child */
@@
-365,7
+365,7
@@
int main(int argc, char *argv[]) {
q = wait_for_terminate(pid, &status);
if (q < 0) {
q = wait_for_terminate(pid, &status);
if (q < 0) {
- log_error_errno(
-
q, "waitid(): %m");
+ log_error_errno(q, "waitid(): %m");
goto finish;
}
goto finish;
}