Add ConsoleSocket to RestoreOpts

avagin · avagin · commit 400dfa3a6d44 · 2018-04-24T08:44:23.000+03:00
It is required to restore a container with a console.

Signed-off-by: Andrei Vagin &lt;avagin@virtuozzo.com&gt;
diff --git a/console.go b/console.go
@@ -43,7 +43,7 @@ func NewConsoleSocket(path string) (*Socket, error) {
 		return nil, err
 	}
 	return &Socket{
-		l:    l,
+		l: l,
 	}, nil
 }
 
diff --git a/runc.go b/runc.go
@@ -512,10 +512,11 @@ type RestoreOpts struct {
 	CheckpointOpts
 	IO
 
-	Detach      bool
-	PidFile     string
-	NoSubreaper bool
-	NoPivot     bool
+	Detach        bool
+	PidFile       string
+	NoSubreaper   bool
+	NoPivot       bool
+	ConsoleSocket ConsoleSocket
 }
 
 func (o *RestoreOpts) args() ([]string, error) {
@@ -530,6 +531,9 @@ func (o *RestoreOpts) args() ([]string, error) {
 		}
 		out = append(out, "--pid-file", abs)
 	}
+	if o.ConsoleSocket != nil {
+		out = append(out, "--console-socket", o.ConsoleSocket.Path())
+	}
 	if o.NoPivot {
 		out = append(out, "--no-pivot")
 	}

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ func NewConsoleSocket(path string) (*Socket, error) {`
`43`	`43`	`return nil, err`
`44`	`44`	`}`
`45`	`45`	`return &Socket{`
`46`		`- l: l,`
	`46`	`+ l: l,`
`47`	`47`	`}, nil`
`48`	`48`	`}`
`49`	`49`
Original file line number	Diff line number	Diff line change
`@@ -512,10 +512,11 @@ type RestoreOpts struct {`
`512`	`512`	`CheckpointOpts`
`513`	`513`	`IO`
`514`	`514`
`515`		`- Detach bool`
`516`		`- PidFile string`
`517`		`- NoSubreaper bool`
`518`		`- NoPivot bool`
	`515`	`+ Detach bool`
	`516`	`+ PidFile string`
	`517`	`+ NoSubreaper bool`
	`518`	`+ NoPivot bool`
	`519`	`+ ConsoleSocket ConsoleSocket`
`519`	`520`	`}`
`520`	`521`
`521`	`522`	`func (o *RestoreOpts) args() ([]string, error) {`
`@@ -530,6 +531,9 @@ func (o *RestoreOpts) args() ([]string, error) {`
`530`	`531`	`}`
`531`	`532`	`out = append(out, "--pid-file", abs)`
`532`	`533`	`}`
	`534`	`+ if o.ConsoleSocket != nil {`
	`535`	`+ out = append(out, "--console-socket", o.ConsoleSocket.Path())`
	`536`	`+ }`
`533`	`537`	`if o.NoPivot {`
`534`	`538`	`out = append(out, "--no-pivot")`
`535`	`539`	`}`