From 458282f27c8fae1d36279fc6575ecd7975eb8501 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Sat, 19 Aug 2017 02:16:38 -0700 Subject: [PATCH] hammer2 - Fix root remount for hammer2 root * mount_hammer2 should not fail in early boot trying to remount / if it is unable to connect to the cluster controller, as it might not be able to start it due to lo0 not being configured yet. --- sbin/mount_hammer2/mount_hammer2.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sbin/mount_hammer2/mount_hammer2.c b/sbin/mount_hammer2/mount_hammer2.c index bf908de956..c31642102b 100644 --- a/sbin/mount_hammer2/mount_hammer2.c +++ b/sbin/mount_hammer2/mount_hammer2.c @@ -158,13 +158,15 @@ main(int ac, char *av[]) * When doing remote mounts that are allowed to run in the background * the mount program will fork, detach, print a message, and exit(0) * the originator while retrying in the background. + * + * Don't exit on failure, this isn't likely going to work for + * the root [re]mount in early boot. */ info.cluster_fd = cluster_connect(devpath); if (info.cluster_fd < 0) { fprintf(stderr, "mount_hammer2: cluster_connect(%s) failed\n", devpath); - exit(1); } /* -- 2.11.4.GIT