Skip to content

pivot: Add some more logging #1801

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cgwalters wants to merge 1 commit into from
Closed

pivot: Add some more logging #1801

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions cmd/machine-config-daemon/pivot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,8 @@ func run(_ *cobra.Command, args []string) error {
flag.Set("logtostderr", "true")
flag.Parse()

glog.Info("pivot starting")

var container string
if fromEtcPullSpec || len(args) == 0 {
fromEtcPullSpec = true
Expand Down Expand Up @@ -235,25 +237,33 @@ func run(_ *cobra.Command, args []string) error {
return nil
}

rebootRequest := ""
if reboot {
glog.Infof("Rebooting as requested by cmdline flag")
rebootRequest = "Rebooting as requested by cmdline flag"
} else {
// Otherwise see if it's specified by the file
_, err = os.Stat(runPivotRebootFile)
if err != nil && !os.IsNotExist(err) {
return errors.Wrapf(err, "Checking %s", runPivotRebootFile)
}
if err == nil {
glog.Infof("Rebooting due to %s", runPivotRebootFile)
reboot = true
rebootRequest = fmt.Sprintf("Rebooting due to %s", runPivotRebootFile)
}
}
if reboot {
if rebootRequest != "" {
glog.Infof("%s", rebootRequest)
logger := exec.Command("logger")
logger.Stdin = strings.NewReader(rebootRequest)
if err := logger.Run(); err != nil {
glog.Errorf("failed to invoke logger: %v", err)
}
// Reboot the machine if asked to do so
err := exec.Command("systemctl", "reboot").Run()
if err != nil {
return errors.Wrapf(err, "rebooting")
}
} else {
glog.Info("Operation complete; no reboot requested")
}
return nil
}
Expand Down