diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/commands.h | 4 | ||||
| -rw-r--r-- | tools/pvscan.c | 27 |
2 files changed, 30 insertions, 1 deletions
diff --git a/tools/commands.h b/tools/commands.h index 8bec0929..21791f77 100644 --- a/tools/commands.h +++ b/tools/commands.h @@ -671,6 +671,7 @@ xx(pvscan, "List all physical volumes", PERMITTED_READ_ONLY, "pvscan " "\n" + "\t[-a|--activate ay]\n" "\t[--cache [ DevicePath | --major major --minor minor]...]\n" "\t[-d|--debug] " "\n" "\t{-e|--exported | -n|--novolumegroup} " "\n" @@ -682,7 +683,8 @@ xx(pvscan, "\t[-v|--verbose] " "\n" "\t[--version]\n", - cache_ARG, exported_ARG, ignorelockingfailure_ARG, major_ARG, minor_ARG, + activate_ARG, available_ARG, cache_ARG, exported_ARG, + ignorelockingfailure_ARG, major_ARG, minor_ARG, novolumegroup_ARG, partial_ARG, short_ARG, uuid_ARG) xx(segtypes, diff --git a/tools/pvscan.c b/tools/pvscan.c index beba1743..a0408998 100644 --- a/tools/pvscan.c +++ b/tools/pvscan.c @@ -97,6 +97,20 @@ static void _pvscan_display_single(struct cmd_context *cmd, pv_pe_size(pv))); } +static int _auto_activation_handler(struct volume_group *vg, int partial, int activate) +{ + /* TODO: add support for partial and clustered VGs */ + if (partial || vg_is_clustered(vg)) + return 1; + + if (!vgchange_activate(vg->cmd, vg, activate)) { + log_error("%s: autoactivation failed.", vg->name); + return 0; + } + + return 1; +} + static int _pvscan_lvmetad_all_devs(struct cmd_context *cmd, activation_handler handler) { struct dev_iter *iter; @@ -136,6 +150,14 @@ static int _pvscan_lvmetad(struct cmd_context *cmd, int argc, char **argv) char *buf; activation_handler handler = NULL; + if (arg_count(cmd, activate_ARG)) { + if (arg_uint_value(cmd, activate_ARG, CHANGE_AAY) != CHANGE_AAY) { + log_error("Only --activate ay allowed with pvscan."); + return 0; + } + handler = _auto_activation_handler; + } + if (arg_count(cmd, major_ARG) + arg_count(cmd, minor_ARG)) devno_args = 1; @@ -241,6 +263,11 @@ int pvscan(struct cmd_context *cmd, int argc, char **argv) if (arg_count(cmd, cache_ARG)) return _pvscan_lvmetad(cmd, argc, argv); + if (arg_count(cmd, activate_ARG)) { + log_error("--activate is only valid with --cache."); + return EINVALID_CMD_LINE; + } + if (arg_count(cmd, major_ARG) + arg_count(cmd, minor_ARG)) { log_error("--major and --minor are only valid with --cache."); return EINVALID_CMD_LINE; |