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

Rewrite a few scripts in Go and remove unneeded services

Browse Source
This commit is contained in:
Josh Curl
2016-10-17 14:47:44 -07:00
parent 9755a37fe6
commit a7d405991c
22 changed files with 321 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
cmd/console/console.go
View File

@@ -105,10 +105,10 @@ func Main() {
cloudinitexecute.ApplyConsole(cfg)
if err := runScript(config.CloudConfigScriptFile); err != nil {
if err := util.RunScript(config.CloudConfigScriptFile); err != nil {
log.Error(err)
}
if err := runScript(startScript); err != nil {
if err := util.RunScript(startScript); err != nil {
log.Error(err)
}
@@ -116,7 +116,7 @@ func Main() {
log.Error(err)
}
if err := runScript("/etc/rc.local"); err != nil {
if err := util.RunScript("/etc/rc.local"); err != nil {
log.Error(err)
}
@@ -282,29 +282,3 @@ func setupSSH(cfg *config.CloudConfig) error {
return os.MkdirAll("/var/run/sshd", 0644)
}
func runScript(path string) error {
if !util.ExistsAndExecutable(path) {
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)
}
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
return cmd.Run()
}