jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make sure pty.Close() will be called and fix comment 

Signed-off-by: tjucoder <chinesecoder@foxmail.com>
This commit is contained in:
tjucoder 2020-07-05 12:10:47 +08:00
parent 1b94395c06
commit ab35cfe23c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libcontainer/init_linux.go
View File

@ -184,6 +184,9 @@ func setupConsole(socket *os.File, config *initConfig, mount bool) error {
return err return err
} }
// After we return from here, we don't need the console anymore.
defer pty.Close()
if config.ConsoleHeight != 0 && config.ConsoleWidth != 0 { if config.ConsoleHeight != 0 && config.ConsoleWidth != 0 {
err = pty.Resize(console.WinSize{ err = pty.Resize(console.WinSize{
Height: config.ConsoleHeight, Height: config.ConsoleHeight,
@ -195,9 +198,6 @@ func setupConsole(socket *os.File, config *initConfig, mount bool) error {
} }
} }
// After we return from here, we don't need the console anymore.
defer pty.Close()
// Mount the console inside our rootfs. // Mount the console inside our rootfs.
if mount { if mount {
if err := mountConsole(slavePath); err != nil { if err := mountConsole(slavePath); err != nil {

2
libcontainer/user/user.go
View File

@ -60,7 +60,7 @@ type Group struct {
// groupFromOS converts an os/user.(*Group) to local Group // groupFromOS converts an os/user.(*Group) to local Group
// //
// (This does not include Pass, Shell or Gecos) // (This does not include Pass or List)
func groupFromOS(g *user.Group) (Group, error) { func groupFromOS(g *user.Group) (Group, error) {
newGroup := Group{ newGroup := Group{
Name: g.Name, Name: g.Name,