Merged by openshift-bot
OpenShift Bot authored on 2016/11/17 06:50:17... | ... |
@@ -126,10 +126,10 @@ func (node *OsdnNode) dockerPreCNICleanup() error { |
126 | 126 |
// "systemctl restart" will bail out (unnecessarily) in the |
127 | 127 |
// OpenShift-in-a-container case, so we work around that by sending |
128 | 128 |
// the messages by hand. |
129 |
- if err := osexec.Command("dbus-send", "--system", "--print-reply", "--reply-timeout=2000", "--type=method_call", "--dest=org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager.Reload"); err != nil { |
|
129 |
+ if _, err := osexec.Command("dbus-send", "--system", "--print-reply", "--reply-timeout=2000", "--type=method_call", "--dest=org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager.Reload").CombinedOutput(); err != nil { |
|
130 | 130 |
log.Error(err) |
131 | 131 |
} |
132 |
- if err := osexec.Command("dbus-send", "--system", "--print-reply", "--reply-timeout=2000", "--type=method_call", "--dest=org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager.RestartUnit", "string:'docker.service' string:'replace'"); err != nil { |
|
132 |
+ if _, err := osexec.Command("dbus-send", "--system", "--print-reply", "--reply-timeout=2000", "--type=method_call", "--dest=org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager.RestartUnit", "string:'docker.service' string:'replace'").CombinedOutput(); err != nil { |
|
133 | 133 |
log.Error(err) |
134 | 134 |
} |
135 | 135 |
|