Merge f225fdbb (automated)

1 files changed, 7 insertions, 7 deletions

diff --git a/runsc/main.go b/runsc/main.go
index e864118b2..c61583441 100644
--- a/runsc/main.go
+++ b/runsc/main.go
@@ -117,13 +117,6 @@ func main() {
 	// All subcommands must be registered before flag parsing.
 	flag.Parse()
 
-	if *testOnlyAllowRunAsCurrentUserWithoutChroot {
-		// SIGTERM is sent to all processes if a test exceeds its
-		// timeout and this case is handled by syscall_test_runner.
-		log.Warningf("Block the TERM signal. This is only safe in tests!")
-		signal.Ignore(syscall.SIGTERM)
-	}
-
 	// Are we showing the version?
 	if *showVersion {
 		// The format here is the same as runc.
@@ -265,6 +258,13 @@ func main() {
 	log.Infof("\t\tStrace: %t, max size: %d, syscalls: %s", conf.Strace, conf.StraceLogSize, conf.StraceSyscalls)
 	log.Infof("***************************")
 
+	if *testOnlyAllowRunAsCurrentUserWithoutChroot {
+		// SIGTERM is sent to all processes if a test exceeds its
+		// timeout and this case is handled by syscall_test_runner.
+		log.Warningf("Block the TERM signal. This is only safe in tests!")
+		signal.Ignore(syscall.SIGTERM)
+	}
+
 	// Call the subcommand and pass in the configuration.
 	var ws syscall.WaitStatus
 	subcmdCode := subcommands.Execute(context.Background(), conf, &ws)