shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-10 16:58:47 +03:00
Code Releases Activity

o Allow more default values to be overridden from config file.

Browse Source 
o Cope with both the readline versions used around here.
This commit is contained in:
Alasdair Kergon 2001-12-31 15:20:18 +00:00
parent 6c94692bc6
commit 529d473095
2 changed files with 45 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/lvchange.c
View File

@ -89,7 +89,7 @@ static int lvchange_single(struct logical_volume *lv)
log_print("Logical volume %s changed", lv->name); log_print("Logical volume %s changed", lv->name);
//autobackup(); /* FIXME autobackup */
return 0; return 0;
} }

68
tools/lvm.c
View File

@ -22,6 +22,10 @@
#ifdef READLINE_SUPPORT #ifdef READLINE_SUPPORT
#include <readline/readline.h> #include <readline/readline.h>
#include <readline/history.h> #include <readline/history.h>
#define MAX_HISTORY 100
#ifndef rl_completion_matches
#define rl_completion_matches(a, b) completion_matches((char *)a, b)
#endif
#endif #endif
/* define exported table of valid switches */ /* define exported table of valid switches */
@ -66,14 +70,18 @@ static int _verbose;
/* /*
* The lvm_system_dir contains: * The lvm_sys_dir contains:
* *
* o The lvm configuration (lvm.conf) * o The lvm configuration (lvm.conf)
* o The persistent filter cache (.cache) * o The persistent filter cache (.cache)
* o Volume group backups (backups) * o Volume group backups (backups)
* *
*/ */
static char _system_dir[PATH_MAX] = "/etc/lvm"; static char _sys_dir[PATH_MAX] = "/etc/lvm";
static char _backup_dir[PATH_MAX];
static char _dev_dir[PATH_MAX];
#define DEFAULT_DEV_DIR "/dev"
/* static functions */ /* static functions */
static void register_commands(void); static void register_commands(void);
@ -459,8 +467,7 @@ static int process_command_line(struct command *com, int *argc, char ***argv)
a->value = optarg; a->value = optarg;
if (!a->fn(a)) { if (!a->fn(a)) {
log_error("Invalid argument %s", log_error("Invalid argument %s", optarg);
optarg);
return 0; return 0;
} }
} }
@ -494,11 +501,9 @@ static struct arg *find_arg(struct command *com, int opt)
return 0; return 0;
} }
/* FIXME: define CMD_SUCCEEDED, and return this instead of zero. */
static int process_common_commands(struct command *com) static int process_common_commands(struct command *com)
{ {
int l; int l;
char backup_dir[PATH_MAX];
if (arg_count(suspend_ARG)) if (arg_count(suspend_ARG))
kill(getpid(), SIGSTOP); kill(getpid(), SIGSTOP);
@ -510,7 +515,6 @@ static int process_common_commands(struct command *com)
if (arg_count(debug_ARG)) if (arg_count(debug_ARG))
_debug = arg_count(debug_ARG); _debug = arg_count(debug_ARG);
/* /*
* verbose * verbose
*/ */
@ -544,9 +548,10 @@ static int process_common_commands(struct command *com)
/* Set autobackup if command takes this option */ /* Set autobackup if command takes this option */
for (l = 0; l < com->num_args; l++) for (l = 0; l < com->num_args; l++)
if (com->valid_args[l] == autobackup_ARG) if (com->valid_args[l] == autobackup_ARG)
if (!autobackup_init(_system_dir)) if (!autobackup_init(_backup_dir))
return EINVALID_CMD_LINE; return EINVALID_CMD_LINE;
/* Zero indicates it's OK to continue processing this command */
return 0; return 0;
} }
@ -747,9 +752,9 @@ static struct dev_filter *filter_setup(struct config_file *cf)
return 0; return 0;
if (lvm_snprintf(cache_file, sizeof(cache_file), if (lvm_snprintf(cache_file, sizeof(cache_file),
"%s/.cache", _system_dir) < 0) { "%s/.cache", _sys_dir) < 0) {
log_err("Persistent cache filename too long ('%s/.cache').", log_error("Persistent cache filename too long ('%s/.cache').",
_system_dir); _sys_dir);
return 0; return 0;
} }
@ -777,9 +782,9 @@ static int _get_env_vars(void)
const char *e; const char *e;
if ((e = getenv("LVM_SYSTEM_DIR"))) { if ((e = getenv("LVM_SYSTEM_DIR"))) {
if (snprintf(_system_dir, sizeof(_system_dir), "%s", e) < 0) { if (lvm_snprintf(_sys_dir, sizeof(_sys_dir), "%s", e) < 0) {
log_err("LVM_SYSTEM_DIR environment variable " log_error("LVM_SYSTEM_DIR environment variable "
"is too long."); "is too long.");
return 0; return 0;
} }
} }
@ -800,10 +805,6 @@ static int init(void)
return 0; return 0;
} }
/* FIXME: Override from config file. (Append trailing slash if reqd) */
cmd->dev_dir = "/dev/";
dm_set_dev_dir(cmd->dev_dir);
if (!(cmd->cf = create_config_file())) { if (!(cmd->cf = create_config_file())) {
stack; stack;
return 0; return 0;
@ -815,9 +816,9 @@ static int init(void)
/* send log messages to stderr for now */ /* send log messages to stderr for now */
init_log(stderr); init_log(stderr);
if (snprintf(config_file, sizeof(config_file), if (lvm_snprintf(config_file, sizeof(config_file),
"%s/lvm.conf", _system_dir) < 0) { "%s/lvm.conf", _sys_dir) < 0) {
log_err("lvm_system_dir was too long"); log_error("lvm_sys_dir was too long");
return 0; return 0;
} }
@ -832,8 +833,25 @@ static int init(void)
__init_log(cmd->cf); __init_log(cmd->cf);
} }
if (lvm_snprintf(_dev_dir, sizeof(_dev_dir), "%s/",
find_config_str(cmd->cf->root, "devices/dir",
'/', DEFAULT_DEV_DIR)) < 0) {
log_error("Device directory given in config file too long");
return 0;
}
cmd->dev_dir = _dev_dir;
dm_set_dev_dir(cmd->dev_dir);
dm_log_init(print_log); dm_log_init(print_log);
if (lvm_snprintf(_backup_dir, sizeof(_backup_dir), "%s",
find_config_str(cmd->cf->root, "backup/dir",
'/', _sys_dir)) < 0) {
log_error("Backup directory given in config file too long");
return 0;
}
if (!dev_cache_setup(cmd->cf)) if (!dev_cache_setup(cmd->cf))
return 0; return 0;
@ -1043,14 +1061,14 @@ static int _hist_file(char *buffer, size_t size)
char *e = getenv("HOME"); char *e = getenv("HOME");
if (lvm_snprintf(buffer, size, "%s/.lvm_history", e) < 0) { if (lvm_snprintf(buffer, size, "%s/.lvm_history", e) < 0) {
log_err("History file path too long (%s/.lvm_history).", e); log_error("$HOME/.lvm_history: path too long");
return 0; return 0;
} }
return 1; return 1;
} }
#define MAX_HISTORY 100
static void _read_history(void) static void _read_history(void)
{ {
char hist_file[PATH_MAX]; char hist_file[PATH_MAX];
@ -1061,7 +1079,9 @@ static void _read_history(void)
if (read_history(hist_file)) if (read_history(hist_file))
log_very_verbose("Couldn't read history from %s.", hist_file); log_very_verbose("Couldn't read history from %s.", hist_file);
stifle_history(MAX_HISTORY); stifle_history(find_config_int(cmd->cf->root, "shell/history_size",
'/', MAX_HISTORY));
} }
static void _write_history(void) static void _write_history(void)