From ae15988eb86c4c3b8e9b6bcdeb1f4428df45ad8f Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 29 Sep 2015 22:38:02 +0200 Subject: [PATCH] Add hook point on fstab mount failure Check return code from `mount -na`, if there where any errors give plugins a chance to do something about it. Signed-off-by: Tobias Waldekranz Signed-off-by: Joachim Nilsson --- finit.c | 9 ++++++++- plugin.h | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/finit.c b/finit.c index b55cf2ff..4f02e451 100644 --- a/finit.c +++ b/finit.c @@ -71,6 +71,7 @@ static int banner(void) int main(int argc, char* argv[]) { + int err; uev_ctx_t loop; /* @@ -151,7 +152,13 @@ int main(int argc, char* argv[]) plugin_run_hooks(HOOK_ROOTFS_UP); umask(0); - run("/bin/mount -na"); + print_desc("Mounting filesystems", NULL); + + err = run("/bin/mount -na"); + print_result(err); + if (err) + plugin_run_hooks(HOOK_MOUNT_ERROR); + run("/sbin/swapon -ea"); umask(0022); diff --git a/plugin.h b/plugin.h index ba77013a..732db61e 100644 --- a/plugin.h +++ b/plugin.h @@ -43,6 +43,7 @@ typedef enum { /* Bootstrap hooks */ HOOK_ROOTFS_UP = 0, + HOOK_MOUNT_ERROR, HOOK_BASEFS_UP, HOOK_NETWORK_UP, HOOK_SVC_UP,