Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
lxc
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
lxc
Commits
327a1e78
Commit
327a1e78
authored
Apr 02, 2016
by
Serge Hallyn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
switch user facing name to lxc.rootfs.backend
Signed-off-by:
Serge Hallyn
<
serge.hallyn@ubuntu.com
>
parent
e82104d3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
confile.c
src/lxc/confile.c
+5
-5
No files found.
src/lxc/confile.c
View file @
327a1e78
...
@@ -73,7 +73,7 @@ static int config_fstab(const char *, const char *, struct lxc_conf *);
...
@@ -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_b
dev_type
(
const
char
*
,
const
char
*
,
struct
lxc_conf
*
);
static
int
config_rootfs_b
ackend
(
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[] = {
...
@@ -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.b
dev"
,
config_rootfs_bdev_type
},
{
"lxc.rootfs.b
ackend"
,
config_rootfs_backend
},
{
"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,
...
@@ -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_b
dev_type
(
const
char
*
key
,
const
char
*
value
,
static
int
config_rootfs_b
ackend
(
const
char
*
key
,
const
char
*
value
,
struct
lxc_conf
*
lxc_conf
)
struct
lxc_conf
*
lxc_conf
)
{
{
if
(
strlen
(
value
)
==
0
)
{
if
(
strlen
(
value
)
==
0
)
{
...
@@ -1864,7 +1864,7 @@ static int config_rootfs_bdev_type(const char *key, const char *value,
...
@@ -1864,7 +1864,7 @@ static int config_rootfs_bdev_type(const char *key, const char *value,
lxc_conf
->
rootfs
.
bdev_type
=
NULL
;
lxc_conf
->
rootfs
.
bdev_type
=
NULL
;
}
}
if
(
!
is_valid_bdev_type
(
value
))
{
if
(
!
is_valid_bdev_type
(
value
))
{
ERROR
(
"Bad
bdev type for %s: %s"
,
key
,
value
);
ERROR
(
"Bad
rootfs.backend: '%s'"
,
value
);
return
-
1
;
return
-
1
;
}
}
...
@@ -2492,7 +2492,7 @@ int lxc_get_config_item(struct lxc_conf *c, const char *key, char *retv,
...
@@ -2492,7 +2492,7 @@ int lxc_get_config_item(struct lxc_conf *c, const char *key, char *retv,
v
=
c
->
console
.
path
;
v
=
c
->
console
.
path
;
else
if
(
strcmp
(
key
,
"lxc.rootfs.mount"
)
==
0
)
else
if
(
strcmp
(
key
,
"lxc.rootfs.mount"
)
==
0
)
v
=
c
->
rootfs
.
mount
;
v
=
c
->
rootfs
.
mount
;
else
if
(
strcmp
(
key
,
"lxc.rootfs.b
dev
"
)
==
0
)
else
if
(
strcmp
(
key
,
"lxc.rootfs.b
ackend
"
)
==
0
)
v
=
c
->
rootfs
.
bdev_type
;
v
=
c
->
rootfs
.
bdev_type
;
else
if
(
strcmp
(
key
,
"lxc.rootfs.options"
)
==
0
)
else
if
(
strcmp
(
key
,
"lxc.rootfs.options"
)
==
0
)
v
=
c
->
rootfs
.
options
;
v
=
c
->
rootfs
.
options
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment