rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-03 15:54:24 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1186 from ibuildthecloud/fix-respawn

Browse Source 
Fix respawn.conf.d
This commit is contained in:
Darren Shepherd
2016-08-25 07:52:27 -07:00
committed by GitHub
parent 22ab564dac 92e20827d8
commit f64314b82f
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/console/console.go
View File

@@ -6,6 +6,7 @@ import (
"io/ioutil" "io/ioutil"
"os" "os"
"os/exec" "os/exec"
"path"
"regexp" "regexp"
"strings" "strings"
"syscall" "syscall"
@@ -180,9 +181,11 @@ func writeRespawn() error {
files, err := ioutil.ReadDir("/etc/respawn.conf.d") files, err := ioutil.ReadDir("/etc/respawn.conf.d")
if err == nil { if err == nil {
for _, f := range files { for _, f := range files {
content, err := ioutil.ReadFile(f.Name()) p := path.Join("/etc/respawn.conf.d", f.Name())
content, err := ioutil.ReadFile(p)
if err != nil { if err != nil {
return err log.Error("Failed to read %s: %v", p, err)
continue
} }
respawn += fmt.Sprintf("\n%s", string(content)) respawn += fmt.Sprintf("\n%s", string(content))
} }