From 4971b41aafa0d7a231c24a3e43ecd5cfd81c7758 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 19 Jan 2017 05:27:49 -0500 Subject: Fix remaining issues. --- systemd-timesyncd-wrap.go | 1 + systemd-timesyncd.service.d-wait.conf | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/systemd-timesyncd-wrap.go b/systemd-timesyncd-wrap.go index 76914a4..9bf5782 100644 --- a/systemd-timesyncd-wrap.go +++ b/systemd-timesyncd-wrap.go @@ -56,6 +56,7 @@ func main() { os.Chown(fake_sockname, uid, gid) os.Setenv("NOTIFY_SOCKET", fake_sockname) + os.Unsetenv("WATCHDOG_PID") proc, err := os.StartProcess(os.Args[1], os.Args[1:], &os.ProcAttr{Files: []*os.File{os.Stdin, os.Stdout, os.Stderr}}) if err != nil { fmt.Fprintln(os.Stderr, err) diff --git a/systemd-timesyncd.service.d-wait.conf b/systemd-timesyncd.service.d-wait.conf index 2775888..b66b18b 100644 --- a/systemd-timesyncd.service.d-wait.conf +++ b/systemd-timesyncd.service.d-wait.conf @@ -1,5 +1,5 @@ [Unit] -Wants=systemd-timesyncd-wait.socket +Wants=systemd-timesyncd-wait.socket systemd-timesyncd-wait.service After=systemd-timesyncd-wait.socket [Service] -- cgit v1.1-4-g5e80