LU-7134 utils: Ensure hostid set for ZFS during mkfs

[fs/lustre-release.git] / lustre / utils / mkfs_lustre.c

diff --git a/lustre/utils/mkfs_lustre.c b/lustre/utils/mkfs_lustre.c
index ca7d5f9..456c37e 100644 (file)
--- a/lustre/utils/mkfs_lustre.c
+++ b/lustre/utils/mkfs_lustre.c
@@ -165,6 +165,8 @@ void usage(FILE *out)
                "\t\t--comment=<user comment>: arbitrary string (%d bytes)\n"
                "\t\t--dryrun: report what we would do; don't write to disk\n"
                "\t\t--verbose: e.g. show mkfs progress\n"
+               "\t\t--force-nohostid: Ignore hostid requirement for ZFS "
+                       "import\n"
                "\t\t-V|--version: output build version of the utility and\n"
                "\t\t\texit\n"
                "\t\t--quiet\n",
@@ -294,6 +296,7 @@ int parse_opts(int argc, char *const argv[], struct mkfs_opts *mop,
                { "servicenode",        required_argument,      NULL, 's' },
                { "network",            required_argument,      NULL, 't' },
                { "comment",            required_argument,      NULL, 'u' },
+               { "force-nohostid",     no_argument,            NULL, 'U' },
                { "verbose",            no_argument,            NULL, 'v' },
                { "version",            no_argument,            NULL, 'V' },
 #ifndef TUNEFS
@@ -468,6 +471,9 @@ int parse_opts(int argc, char *const argv[], struct mkfs_opts *mop,
                        strscpy(ldd->ldd_userdata, optarg,
                                sizeof(ldd->ldd_userdata));
                        break;
+               case 'U':
+                       mop->mo_flags |= MO_NOHOSTID_CHECK;
+                       break;
                case 'v':
                        verbose++;
                        break;