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
0f4d7aff
Commit
0f4d7aff
authored
Mar 01, 2016
by
Stéphane Graber
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #863 from brauner/bugfix_branch
lxc-copy: correct order of copy and original & lxc-attach: setup ts->stdoutfd
parents
ebffa9db
12752e27
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
lxc_attach.c
src/lxc/lxc_attach.c
+1
-0
lxc_copy.c
src/lxc/lxc_copy.c
+2
-3
No files found.
src/lxc/lxc_attach.c
View file @
0f4d7aff
...
@@ -273,6 +273,7 @@ static int get_pty_on_host(struct lxc_container *c, struct wrapargs *wrap, int *
...
@@ -273,6 +273,7 @@ static int get_pty_on_host(struct lxc_container *c, struct wrapargs *wrap, int *
if
(
lxc_console_create
(
conf
)
<
0
)
if
(
lxc_console_create
(
conf
)
<
0
)
return
-
1
;
return
-
1
;
ts
=
conf
->
console
.
tty_state
;
ts
=
conf
->
console
.
tty_state
;
ts
->
stdoutfd
=
STDOUT_FILENO
;
conf
->
console
.
descr
=
&
descr
;
conf
->
console
.
descr
=
&
descr
;
/* Shift ttys to container. */
/* Shift ttys to container. */
...
...
src/lxc/lxc_copy.c
View file @
0f4d7aff
...
@@ -358,8 +358,7 @@ static int do_clone(struct lxc_container *c, char *newname, char *newpath,
...
@@ -358,8 +358,7 @@ static int do_clone(struct lxc_container *c, char *newname, char *newpath,
return
-
1
;
return
-
1
;
}
}
INFO
(
"Created container %s as %s of %s
\n
"
,
newname
,
INFO
(
"Created %s as %s of %s
\n
"
,
newname
,
task
?
"snapshot"
:
"copy"
,
c
->
name
);
task
?
"snapshot"
:
"copy"
,
c
->
name
);
lxc_container_put
(
clone
);
lxc_container_put
(
clone
);
...
@@ -421,7 +420,7 @@ static int do_clone_ephemeral(struct lxc_container *c,
...
@@ -421,7 +420,7 @@ static int do_clone_ephemeral(struct lxc_container *c,
goto
destroy_and_put
;
goto
destroy_and_put
;
if
(
!
my_args
.
quiet
)
if
(
!
my_args
.
quiet
)
printf
(
"Created %s as
%s of %s
\n
"
,
arg
->
name
,
"clone"
,
arg
->
new
name
);
printf
(
"Created %s as
clone of %s
\n
"
,
arg
->
newname
,
arg
->
name
);
if
(
!
arg
->
daemonize
&&
arg
->
argc
)
{
if
(
!
arg
->
daemonize
&&
arg
->
argc
)
{
clone
->
want_daemonize
(
clone
,
true
);
clone
->
want_daemonize
(
clone
,
true
);
...
...
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