rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-01 06:40:31 +00:00
Code Issues Releases Wiki Activity

Execute start scripts using bash

Browse Source
This commit is contained in:
Josh Curl
2016-08-31 16:18:51 -07:00
parent bd904fcbda
commit d4a026dc5d
4 changed files with 62 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
cmd/console/console.go
View File

@@ -105,25 +105,14 @@ func Main() {
cloudinitexecute.ApplyConsole(cfg)
if util.ExistsAndExecutable(config.CloudConfigScriptFile) {
cmd := exec.Command(config.CloudConfigScriptFile)
if err := cmd.Run(); err != nil {
log.Error(err)
}
if err := runScript(config.CloudConfigScriptFile); err != nil {
log.Error(err)
}
if util.ExistsAndExecutable(startScript) {
cmd := exec.Command(startScript)
if err := cmd.Run(); err != nil {
log.Error(err)
}
if err := runScript(startScript); err != nil {
log.Error(err)
}
if util.ExistsAndExecutable("/etc/rc.local") {
cmd := exec.Command("/etc/rc.local")
if err := cmd.Run(); err != nil {
log.Error(err)
}
if err := runScript("/etc/rc.local"); err != nil {
log.Error(err)
}
os.Setenv("TERM", "linux")
@@ -292,3 +281,26 @@ func setupSSH(cfg *config.CloudConfig) error {
return os.MkdirAll("/var/run/sshd", 0644)
}
func runScript(path string) error {
if !util.ExistsAndExecutable(config.CloudConfigScriptFile) {
return nil
}
script, err := os.Open(path)
if err != nil {
return err
}
magic := make([]byte, 2)
if _, err = script.Read(magic); err != nil {
return err
}
cmd := exec.Command("/bin/sh", path)
if string(magic) == "#!" {
cmd = exec.Command(path)
}
return cmd.Run()
}