shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-26 22:50:36 +03:00
Code Releases Activity

Prepare to move guts of vgremove into lvm library.

Browse Source 
Fixup force_t.
This commit is contained in:
Dave Wysochanski 2007-08-21 16:40:33 +00:00
parent 9cab88c59f
commit 3d33abbb8c
3 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/metadata/lv_manip.c
View File

@ -1850,7 +1850,7 @@ int lv_remove_single(struct cmd_context *cmd, struct logical_volume *lv,
return 0;
}
if (info.exists && (force == DONT_FORCE)) {
if (info.exists && (force == PROMPT)) {
if (yes_no_prompt("Do you really want to remove active "
"logical volume \"%s\"? [y/n]: ",
lv->name) == 'n') {

6
lib/metadata/metadata-exported.h
View File

@ -107,9 +107,9 @@ typedef enum {
* Whether or not to force an operation.
*/
typedef enum {
DONT_FORCE = 0,
FORCE_NO_CONFIRM = 1, /* skip yes/no confirmation of operation */
FORCE_OVERRIDE = 2 /* skip confirmation and bypass a second condition */
PROMPT = 0, /* Issue yes/no prompt to confirm operation */
DONT_PROMPT = 1, /* Skip yes/no prompt */
DONT_PROMPT_OVERRIDE = 2 /* Skip prompt + override a second condition */
} force_t;
struct cmd_context;

34
tools/vgremove.c
View File

@ -15,37 +15,37 @@
#include "tools.h"
static int vgremove_single(struct cmd_context *cmd, const char *vg_name,
struct volume_group *vg, int consistent,
void *handle __attribute((unused)))
static int vg_remove_single(struct cmd_context *cmd, const char *vg_name,
struct volume_group *vg, int consistent,
force_t force)
{
struct physical_volume *pv;
struct pv_list *pvl;
int ret = ECMD_PROCESSED;
int ret = 1;
if (!vg || !consistent || (vg_status(vg) & PARTIAL_VG)) {
log_error("Volume group \"%s\" not found or inconsistent.",
vg_name);
log_error("Consider vgreduce --removemissing if metadata "
"is inconsistent.");
return ECMD_FAILED;
return 0;
}
if (!vg_check_status(vg, EXPORTED_VG))
return ECMD_FAILED;
return 0;
if (vg->lv_count) {
log_error("Volume group \"%s\" still contains %d "
"logical volume(s)", vg_name, vg->lv_count);
return ECMD_FAILED;
return 0;
}
if (!archive(vg))
return ECMD_FAILED;
return 0;
if (!vg_remove(vg)) {
log_error("vg_remove %s failed", vg_name);
return ECMD_FAILED;
return 0;
}
/* init physical volumes */
@ -58,7 +58,7 @@ static int vgremove_single(struct cmd_context *cmd, const char *vg_name,
if (!dev_get_size(pv_dev(pv), &pv->size)) {
log_error("%s: Couldn't get size.", dev_name(pv_dev(pv)));
ret = ECMD_FAILED;
ret = 0;
continue;
}
@ -67,19 +67,29 @@ static int vgremove_single(struct cmd_context *cmd, const char *vg_name,
log_error("Failed to remove physical volume \"%s\""
" from volume group \"%s\"",
dev_name(pv_dev(pv)), vg_name);
ret = ECMD_FAILED;
ret = 0;
}
}
backup_remove(cmd, vg_name);
if (ret == ECMD_PROCESSED)
if (ret)
log_print("Volume group \"%s\" successfully removed", vg_name);
else
log_error("Volume group \"%s\" not properly removed", vg_name);
return ret;
}
static int vgremove_single(struct cmd_context *cmd, const char *vg_name,
struct volume_group *vg, int consistent,
void *handle __attribute((unused)))
{
if (!vg_remove_single(cmd, vg_name, vg, consistent,
arg_count(cmd, force_ARG)))
return ECMD_FAILED;
return ECMD_PROCESSED;
}
int vgremove(struct cmd_context *cmd, int argc, char **argv)
{