2 files changed, 11 insertions, 19 deletions
diff --git a/runsc/cmd/boot.go b/runsc/cmd/boot.go
index a14249641..42c66fbcf 100644
--- a/runsc/cmd/boot.go
+++ b/runsc/cmd/boot.go
@@ -157,10 +157,8 @@ func (b *Boot) Execute(_ context.Context, f *flag.FlagSet, args ...interface{})
 			// we will read it again after the exec call. This works
 			// because the ReadSpecFromFile function seeks to the beginning
 			// of the file before reading.
-			if err := callSelfAsNobody(args); err != nil {
-				Fatalf("%v", err)
-			}
-			panic("callSelfAsNobody must never return success")
+			Fatalf("callSelfAsNobody(%v): %v", args, callSelfAsNobody(args))
+			panic("unreachable")
 		}
 	}
 
@@ -199,10 +197,8 @@ func (b *Boot) Execute(_ context.Context, f *flag.FlagSet, args ...interface{})
 		// we will read it again after the exec call. This works
 		// because the ReadSpecFromFile function seeks to the beginning
 		// of the file before reading.
-		if err := setCapsAndCallSelf(args, caps); err != nil {
-			Fatalf("%v", err)
-		}
-		panic("setCapsAndCallSelf must never return success")
+		Fatalf("setCapsAndCallSelf(%v, %v): %v", args, caps, setCapsAndCallSelf(args, caps))
+		panic("unreachable")
 	}
 
 	// Read resolved mount list and replace the original one from the spec.
diff --git a/runsc/cmd/gofer.go b/runsc/cmd/gofer.go
index 6a755ecb6..80da9c9a2 100644
--- a/runsc/cmd/gofer.go
+++ b/runsc/cmd/gofer.go
@@ -116,9 +116,7 @@ func (g *Gofer) Execute(_ context.Context, f *flag.FlagSet, args ...interface{})
 		// Note: minimal argument handling for the default case to keep it simple.
 		args := os.Args
 		args = append(args, "--apply-caps=false", "--setup-root=false")
-		if err := setCapsAndCallSelf(args, goferCaps); err != nil {
-			Fatalf("Unable to apply caps: %v", err)
-		}
+		Fatalf("setCapsAndCallSelf(%v, %v): %v", args, goferCaps, setCapsAndCallSelf(args, goferCaps))
 		panic("unreachable")
 	}
 
@@ -473,14 +471,12 @@ func adjustMountOptions(conf *config.Config, path string, opts []string) ([]stri
 	rv := make([]string, len(opts))
 	copy(rv, opts)
 
-	if conf.OverlayfsStaleRead {
-		statfs := unix.Statfs_t{}
-		if err := unix.Statfs(path, &statfs); err != nil {
-			return nil, err
-		}
-		if statfs.Type == unix.OVERLAYFS_SUPER_MAGIC {
-			rv = append(rv, "overlayfs_stale_read")
-		}
+	statfs := unix.Statfs_t{}
+	if err := unix.Statfs(path, &statfs); err != nil {
+		return nil, err
+	}
+	if statfs.Type == unix.OVERLAYFS_SUPER_MAGIC {
+		rv = append(rv, "overlayfs_stale_read")
 	}
 	return rv, nil
 }