Merge 4183b902 (automated)

2 files changed, 5 insertions, 0 deletions

diff --git a/runsc/boot/config.go b/runsc/boot/config.go
index 6f1eb9a41..7ae0dd05d 100644
--- a/runsc/boot/config.go
+++ b/runsc/boot/config.go
@@ -198,6 +198,9 @@ type Config struct {
 	// sandbox and Gofer process run as root inside a user namespace with root
 	// mapped to the caller's user.
 	Rootless bool
+
+	// AlsoLogToStderr allows to send log messages to stderr.
+	AlsoLogToStderr bool
 }
 
 // ToFlags returns a slice of flags that correspond to the given Config.
@@ -223,6 +226,7 @@ func (c *Config) ToFlags() []string {
 		"--net-raw=" + strconv.FormatBool(c.EnableRaw),
 		"--num-network-channels=" + strconv.Itoa(c.NumNetworkChannels),
 		"--rootless=" + strconv.FormatBool(c.Rootless),
+		"--alsologtostderr=" + strconv.FormatBool(c.AlsoLogToStderr),
 	}
 	if c.TestOnlyAllowRunAsCurrentUserWithoutChroot {
 		// Only include if set since it is never to be used by users.
diff --git a/runsc/main.go b/runsc/main.go
index bc83c57a2..5823819f4 100644
--- a/runsc/main.go
+++ b/runsc/main.go
@@ -190,6 +190,7 @@ func main() {
 		EnableRaw:          *netRaw,
 		NumNetworkChannels: *numNetworkChannels,
 		Rootless:           *rootless,
+		AlsoLogToStderr:    *alsoLogToStderr,
 
 		TestOnlyAllowRunAsCurrentUserWithoutChroot: *testOnlyAllowRunAsCurrentUserWithoutChroot,
 	}