This commit is contained in:
Dimitri John Ledkov
2015-06-08 17:13:41 +01:00
parent 75bf4a30a2
commit bfbb59bdee
2 changed files with 8 additions and 8 deletions
+1 -1
View File
@@ -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
View File
@@ -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
}