mirror of
https://github.com/kubereboot/kured.git
synced 2026-08-19 19:36:18 +00:00
Fix invoke reboot for custom commands
Without this patch, the rebootCommand passed to invokeReboot is ignored, and the command used for reboot is always systemctl reboot. This is a problem, as we are aiming for flexible commands for this release. This fixes it by restoring the previous behaviour before commit [1] happened. [1]: https://github.com/weaveworks/kured/commit/694957d56e7729ba6493fadca6cd9c1ac0a398fa
This commit is contained in:
committed by
Christian Kotzbauer
parent
e09359e46c
commit
4d45fa8bdb
+2
-4
@@ -23,6 +23,7 @@ import (
|
||||
|
||||
"github.com/google/shlex"
|
||||
|
||||
shoutrrr "github.com/containrrr/shoutrrr"
|
||||
"github.com/prometheus/client_golang/prometheus"
|
||||
"github.com/prometheus/client_golang/prometheus/promhttp"
|
||||
"github.com/weaveworks/kured/pkg/alerts"
|
||||
@@ -31,7 +32,6 @@ import (
|
||||
"github.com/weaveworks/kured/pkg/notifications/slack"
|
||||
"github.com/weaveworks/kured/pkg/taints"
|
||||
"github.com/weaveworks/kured/pkg/timewindow"
|
||||
shoutrrr "github.com/containrrr/shoutrrr"
|
||||
)
|
||||
|
||||
var (
|
||||
@@ -377,9 +377,7 @@ func invokeReboot(nodeID string, rebootCommand []string) {
|
||||
}
|
||||
}
|
||||
|
||||
// Relies on hostPID:true and privileged:true to enter host mount space
|
||||
rebootCmd := newCommand("/usr/bin/nsenter", "-m/proc/1/ns/mnt", "/bin/systemctl", "reboot")
|
||||
if err := rebootCmd.Run(); err != nil {
|
||||
if err := newCommand(rebootCommand[0], rebootCommand[1:]...).Run(); err != nil {
|
||||
log.Fatalf("Error invoking reboot command: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user