proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-09 12:43:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #938 from hallyn/2016-04-02/bdev.2

Browse Source 
use more accurate bdev_type name for rootfs.bdev
This commit is contained in:
Christian Brauner 2016-04-02 23:29:07 +02:00
commit c78de02c27
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lxc/bdev/bdev.c
View File

@ -858,8 +858,8 @@ static const struct bdev_type *bdev_query(struct lxc_conf *conf, const char *src
{ {
int i; int i;
if (conf->rootfs.bdev) if (conf->rootfs.bdev_type)
return get_bdev_by_name(conf->rootfs.bdev); return get_bdev_by_name(conf->rootfs.bdev_type);
for (i = 0; i < numbdevs; i++) { for (i = 0; i < numbdevs; i++) {
int r; int r;

2
src/lxc/conf.c
View File

@ -4142,7 +4142,7 @@ void lxc_conf_free(struct lxc_conf *conf)
free(conf->console.log_path); free(conf->console.log_path);
free(conf->console.path); free(conf->console.path);
free(conf->rootfs.mount); free(conf->rootfs.mount);
free(conf->rootfs.bdev); free(conf->rootfs.bdev_type);
free(conf->rootfs.options); free(conf->rootfs.options);
free(conf->rootfs.path); free(conf->rootfs.path);
free(conf->logfile); free(conf->logfile);

4
src/lxc/conf.h
View File

@ -220,13 +220,13 @@ struct lxc_console {
* @path : the rootfs source (directory or device) * @path : the rootfs source (directory or device)
* @mount : where it is mounted * @mount : where it is mounted
* @options : mount options * @options : mount options
* @bev : optional backing store type * @bev_type : optional backing store type
*/ */
struct lxc_rootfs { struct lxc_rootfs {
char *path; char *path;
char *mount; char *mount;
char *options; char *options;
char *bdev; char *bdev_type;
}; };
/* /*

8
src/lxc/confile.c
View File

@ -73,7 +73,7 @@ static int config_fstab(const char *, const char *, struct lxc_conf *);
static int config_rootfs(const char *, const char *, struct lxc_conf *); static int config_rootfs(const char *, const char *, struct lxc_conf *);
static int config_rootfs_mount(const char *, const char *, struct lxc_conf *); static int config_rootfs_mount(const char *, const char *, struct lxc_conf *);
static int config_rootfs_options(const char *, const char *, struct lxc_conf *); static int config_rootfs_options(const char *, const char *, struct lxc_conf *);
static int config_rootfs_bdev(const char *, const char *, struct lxc_conf *); static int config_rootfs_bdev_type(const char *, const char *, struct lxc_conf *);
static int config_pivotdir(const char *, const char *, struct lxc_conf *); static int config_pivotdir(const char *, const char *, struct lxc_conf *);
static int config_utsname(const char *, const char *, struct lxc_conf *); static int config_utsname(const char *, const char *, struct lxc_conf *);
static int config_hook(const char *, const char *, struct lxc_conf *lxc_conf); static int config_hook(const char *, const char *, struct lxc_conf *lxc_conf);
@ -132,7 +132,7 @@ static struct lxc_config_t config[] = {
{ "lxc.mount", config_fstab }, { "lxc.mount", config_fstab },
{ "lxc.rootfs.mount", config_rootfs_mount }, { "lxc.rootfs.mount", config_rootfs_mount },
{ "lxc.rootfs.options", config_rootfs_options }, { "lxc.rootfs.options", config_rootfs_options },
{ "lxc.rootfs.bdev", config_rootfs_bdev }, { "lxc.rootfs.bdev", config_rootfs_bdev_type },
{ "lxc.rootfs", config_rootfs }, { "lxc.rootfs", config_rootfs },
{ "lxc.pivotdir", config_pivotdir }, { "lxc.pivotdir", config_pivotdir },
{ "lxc.utsname", config_utsname }, { "lxc.utsname", config_utsname },
@ -1856,7 +1856,7 @@ static int config_rootfs_options(const char *key, const char *value,
return config_string_item(&lxc_conf->rootfs.options, value); return config_string_item(&lxc_conf->rootfs.options, value);
} }
static int config_rootfs_bdev(const char *key, const char *value, static int config_rootfs_bdev_type(const char *key, const char *value,
struct lxc_conf *lxc_conf) struct lxc_conf *lxc_conf)
{ {
if (!is_valid_bdev_type(value)) { if (!is_valid_bdev_type(value)) {
@ -1864,7 +1864,7 @@ static int config_rootfs_bdev(const char *key, const char *value,
return -1; return -1;
} }
return config_string_item(&lxc_conf->rootfs.bdev, value); return config_string_item(&lxc_conf->rootfs.bdev_type, value);
} }
static int config_pivotdir(const char *key, const char *value, static int config_pivotdir(const char *key, const char *value,