From 4af6588d57ab60454500b6789c87586bf0f69fe3 Mon Sep 17 00:00:00 2001 From: Steve Dickson Date: Fri, 16 Mar 2007 17:08:04 +1100 Subject: [PATCH] Return the correct exit status on failed mounts Signed-off-by: Steve Dickson Signed-off-by: Neil Brown --- utils/mount/mount.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/utils/mount/mount.c b/utils/mount/mount.c index 7d58ef6..72cb89d 100644 --- a/utils/mount/mount.c +++ b/utils/mount/mount.c @@ -392,19 +392,25 @@ int main(int argc, char *argv[]) start_statd(); } - if (!mnt_err && !fake) { - mnt_err = do_mount_syscall(spec, mount_point, nfs_mount_vers == 4 ? "nfs4" : "nfs", flags, mount_opts); - - if(mnt_err) { - mount_error(mount_point); - exit(-1); - } + if (fake) + return 0; + if (mnt_err) + exit(EX_FAIL); - if(!nomtab) - add_mtab(spec, mount_point, nfs_mount_vers == 4 ? "nfs4" : "nfs", - flags, extra_opts, 0, 0); + mnt_err = do_mount_syscall(spec, mount_point, + nfs_mount_vers == 4 ? "nfs4" : "nfs", + flags, mount_opts); + + if (mnt_err) { + mount_error(mount_point); + exit(EX_FAIL); } + if (!nomtab) + add_mtab(spec, mount_point, + nfs_mount_vers == 4 ? "nfs4" : "nfs", + flags, extra_opts, 0, 0); + return 0; } -- 2.39.5