gopkg/service
2
0
Fork 0
Code Pull Requests Activity

Change escaping rules of executable paths to cope with older versions of systemd

Browse Source
This commit is contained in:
Alan Shreve
2015-08-10 17:23:52 -07:00
parent 1ab12303aa
commit b008df209b
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
service_linux.go
+3
View File
@@ -69,4 +69,7 @@ var tf = map[string]interface{}{
"cmd": func(s string) string { "cmd": func(s string) string {
return `"` + strings.Replace(s, `"`, `\"`, -1) + `"` return `"` + strings.Replace(s, `"`, `\"`, -1) + `"`
}, },
"cmdEscape": func(s string) string {
return strings.Replace(s, " ", `\x20`, -1)
},
} }
service_systemd_linux.go
+2 -2
View File
@@ -157,12 +157,12 @@ func (s *systemd) Restart() error {
const systemdScript = `[Unit] const systemdScript = `[Unit]
Description={{.Description}} Description={{.Description}}
ConditionFileIsExecutable={{.Path|cmd}} ConditionFileIsExecutable={{.Path|cmdEscape}}
[Service] [Service]
StartLimitInterval=5 StartLimitInterval=5
StartLimitBurst=10 StartLimitBurst=10
ExecStart={{.Path|cmd}}{{range .Arguments}} {{.|cmd}}{{end}} ExecStart={{.Path|cmdEscape}}{{range .Arguments}} {{.|cmd}}{{end}}
{{if .ChRoot}}RootDirectory={{.ChRoot|cmd}}{{end}} {{if .ChRoot}}RootDirectory={{.ChRoot|cmd}}{{end}}
{{if .WorkingDirectory}}WorkingDirectory={{.WorkingDirectory|cmd}}{{end}} {{if .WorkingDirectory}}WorkingDirectory={{.WorkingDirectory|cmd}}{{end}}
{{if .UserName}}User={{.UserName}}{{end}} {{if .UserName}}User={{.UserName}}{{end}}