split RebootVerified into RebootAsExpected/RebootDidNotHappen

thanks mvo 

1 files changed, 8 insertions, 6 deletions

diff --git a/daemon/daemon.go b/daemon/daemon.go
index 56b7d6bb34..c039f1a85c 100644
--- a/daemon/daemon.go
+++ b/daemon/daemon.go
@@ -659,12 +659,14 @@ func clearReboot(st *state.State) {
	st.Set("daemon-system-restart-tentative", nil)
 }
 
-// RebootVerified implements overlord.RestartBehavior.
-func (d *Daemon) RebootVerified(st *state.State, expectedRebootDidNotHappen bool) error {
-	if !expectedRebootDidNotHappen {
-	clearReboot(st)
-	return nil
-	}
+// RebootAsExpected implements part of overlord.RestartBehavior.
+func (d *Daemon) RebootAsExpected(st *state.State) error {
+	clearReboot(st)
+	return nil
+}
+
+// RebootDidNotHappen implements part of overlord.RestartBehavior.
+func (d *Daemon) RebootDidNotHappen(st *state.State) error {
	var nTentative int
	err := st.Get("daemon-system-restart-tentative", &nTentative)
	if err != nil && err != state.ErrNoState {