mirror of
https://github.com/clearlinux/rkt.git
synced 2026-09-03 20:31:35 +00:00
go fmt
This commit is contained in:
+1
-1
@@ -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))
|
||||
|
||||
+7
-7
@@ -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
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user