diff options
| author | Thomas Hindoe Paaboel Andersen <phomes@gmail.com> | 2015-04-28 20:59:36 +0200 |
|---|---|---|
| committer | Thomas Hindoe Paaboel Andersen <phomes@gmail.com> | 2015-05-12 22:09:48 +0200 |
| commit | 91077af69e4eb5f7631e25a2bc5ae8e3c9c08178 (patch) | |
| tree | 27dcb522ab6a94433c08c1ee49e4d5f838fb78bc /src/fsck | |
| parent | ecb17862ad969cc15e94f95d0255b51ba3e588e1 (diff) | |
| download | systemd-91077af69e4eb5f7631e25a2bc5ae8e3c9c08178.tar.gz | |
fsck: add enum with fsck exit codes
Diffstat (limited to 'src/fsck')
| -rw-r--r-- | src/fsck/fsck.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c index 56d880ac81..9bbe9ff673 100644 --- a/src/fsck/fsck.c +++ b/src/fsck/fsck.c @@ -42,6 +42,18 @@ #include "path-util.h" #include "socket-util.h" +/* exit codes as defined in fsck(8) */ +enum { + FSCK_SUCCESS = 0, + FSCK_ERROR_CORRECTED = 1, + FSCK_SYSTEM_SHOULD_REBOOT = 2, + FSCK_ERRORS_LEFT_UNCORRECTED = 4, + FSCK_OPERATIONAL_ERROR = 8, + FSCK_USAGE_OR_SYNTAX_ERROR = 16, + FSCK_USER_CANCELLED = 32, + FSCK_SHARED_LIB_ERROR = 128, +}; + static bool arg_skip = false; static bool arg_force = false; static bool arg_show_progress = false; @@ -424,7 +436,7 @@ int main(int argc, char *argv[]) { cmdline[i++] = NULL; execv(cmdline[0], (char**) cmdline); - _exit(8); /* Operational error */ + _exit(FSCK_OPERATIONAL_ERROR); } progress_pipe[1] = safe_close(progress_pipe[1]); @@ -448,10 +460,10 @@ int main(int argc, char *argv[]) { r = -EINVAL; - if (status.si_code == CLD_EXITED && (status.si_status & 2) && root_directory) + if (status.si_code == CLD_EXITED && (status.si_status & FSCK_SYSTEM_SHOULD_REBOOT) && root_directory) /* System should be rebooted. */ start_target(SPECIAL_REBOOT_TARGET); - else if (status.si_code == CLD_EXITED && (status.si_status & 6)) + else if (status.si_code == CLD_EXITED && (status.si_status & (FSCK_SYSTEM_SHOULD_REBOOT | FSCK_ERRORS_LEFT_UNCORRECTED))) /* Some other problem */ start_target(SPECIAL_EMERGENCY_TARGET); else { @@ -462,7 +474,7 @@ int main(int argc, char *argv[]) { } else r = 0; - if (status.si_code == CLD_EXITED && (status.si_status & 1)) + if (status.si_code == CLD_EXITED && (status.si_status & FSCK_ERROR_CORRECTED)) (void) touch("/run/systemd/quotacheck"); finish: |