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
b635dc4f
Unverified
Commit
b635dc4f
authored
May 26, 2018
by
Christian Brauner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
conf: make is_execute a boolean
Signed-off-by:
Christian Brauner
<
christian.brauner@ubuntu.com
>
parent
1aa52fc6
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
conf.h
src/lxc/conf.h
+1
-1
execute.c
src/lxc/execute.c
+1
-1
start.c
src/lxc/start.c
+1
-1
No files found.
src/lxc/conf.h
View file @
b635dc4f
...
...
@@ -214,10 +214,10 @@ struct lxc_state_client {
struct
lxc_conf
{
/* Pointer to the name of the container. Do not free! */
const
char
*
name
;
int
is_execute
;
char
*
fstab
;
unsigned
int
tty
;
unsigned
int
pts
;
bool
is_execute
;
int
reboot
;
signed
long
personality
;
struct
utsname
*
utsname
;
...
...
src/lxc/execute.c
View file @
b635dc4f
...
...
@@ -152,7 +152,7 @@ int lxc_execute(const char *name, char *const argv[], int quiet,
struct
execute_args
args
=
{.
argv
=
argv
,
.
quiet
=
quiet
};
TRACE
(
"Doing lxc_execute"
);
handler
->
conf
->
is_execute
=
1
;
handler
->
conf
->
is_execute
=
true
;
return
__lxc_start
(
name
,
handler
,
&
execute_start_ops
,
&
args
,
lxcpath
,
backgrounded
,
error_num
);
}
src/lxc/start.c
View file @
b635dc4f
...
...
@@ -1247,7 +1247,7 @@ static int do_start(void *data)
* make sure that that pty is stdin,stdout,stderr.
*/
if
(
handler
->
conf
->
console
.
slave
>=
0
)
{
if
(
handler
->
backgrounded
||
handler
->
conf
->
is_execute
==
0
)
if
(
handler
->
backgrounded
||
!
handler
->
conf
->
is_execute
)
ret
=
set_stdfds
(
handler
->
conf
->
console
.
slave
);
else
ret
=
lxc_terminal_set_stdfds
(
handler
->
conf
->
console
.
slave
);
...
...
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