diff --git a/stage1/init/init.go b/stage1/init/init.go index 4760d00..ab8e950 100644 --- a/stage1/init/init.go +++ b/stage1/init/init.go @@ -225,7 +225,7 @@ func getNspawnArgsEnv(p *Pod, debug bool) ([]string, []string, error) { // path from within the stage1 rootfs, to avoid loading host // libraries, or worse not finding libraries on the host, // whilst present in the stage1 rootfs. - if (p.Stage1Options.interpBin != "" && p.Stage1Options.interpPath != "") { + if p.Stage1Options.interpBin != "" && p.Stage1Options.interpPath != "" { args = append(args, filepath.Join(common.Stage1RootfsPath(p.Root), p.Stage1Options.interpBin)) args = append(args, "--library-path") args = append(args, filepath.Join(common.Stage1RootfsPath(p.Root), p.Stage1Options.interpPath)) diff --git a/stage1/init/pod.go b/stage1/init/pod.go index 9e1c654..9642fc2 100644 --- a/stage1/init/pod.go +++ b/stage1/init/pod.go @@ -64,16 +64,16 @@ const ( interpPathEntrypoint = "coreos.com/rkt/stage1/ld-path" shimEntrypoint = "coreos.com/rkt/stage1/shim" // flavor could be dropped in favor of piggy-backing onto lack of shim ?! - flavorEntrypoint = "coreos.com/rkt/stage1/flavor" + flavorEntrypoint = "coreos.com/rkt/stage1/flavor" ) type Stage1Option struct { - nspawnBin string - systemdversion string - interpBin string - interpPath string - shimPath string - flavor string + nspawnBin string + systemdversion string + interpBin string + interpPath string + shimPath string + flavor string systemdSupportsJournalLinking bool }