rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-17 23:48:09 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1056 from joshwget/respect-customization

Browse Source 
Fix two instances where customization isn't respected
This commit is contained in:
Darren Shepherd
2016-06-28 15:44:08 -07:00
committed by GitHub
parent 9abb58641d b09c09edf4
commit b0c6ad709c
4 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/control/console.go
View File

@@ -76,7 +76,7 @@ func consoleSwitch(c *cli.Context) error {
Privileged: true,
Net: "host",
Pid: "host",
Image: fmt.Sprintf("rancher/os-base:%s", config.VERSION),
Image: config.OS_BASE,
Labels: map[string]string{
config.SCOPE: config.SYSTEM,
},

2
cmd/control/selinux.go
View File

@@ -50,7 +50,7 @@ func selinuxCommand() cli.Command {
"-v", "/etc/selinux:/etc/selinux",
"-v", "/var/lib/selinux:/var/lib/selinux",
"-v", "/usr/share/selinux:/usr/share/selinux",
fmt.Sprintf("rancher/os-selinuxtools:%s", config.VERSION+config.SUFFIX), "bash"}
fmt.Sprintf("%s/os-selinuxtools:%s%s", config.OS_REPO, config.VERSION, config.SUFFIX), "bash"}
syscall.Exec("/bin/system-docker", argv, []string{})
return nil
}