Merge pull request #3367 from canonical/avoid-state-fix-from-off-to-s…

…topped

[daemon] Avoid fixing state from off to stopped

src/daemon/daemon.cpp

@@ -1480,11 +1480,14 @@ mp::Daemon::Daemon(std::unique_ptr<const DaemonConfig> the_config)
         allocated_mac_addrs = std::move(new_macs); // Add the new macs to the daemon's list only if we got this far
 
         // FIXME: somehow we're writing contradictory state to disk.
-        if (spec.deleted && spec.state != VirtualMachine::State::stopped)
+        if (spec.deleted && spec.state != VirtualMachine::State::stopped && spec.state != VirtualMachine::State::off)
         {
-            mpl::log(mpl::Level::warning, category,
-                     fmt::format("{} is deleted but has incompatible state {}, resetting state to 0 (stopped)", name,
-                                 static_cast<int>(spec.state)));
+            mpl::log(mpl::Level::warning,
+                     category,
+                     fmt::format("{} is deleted but has incompatible state {}, resetting state to {} (stopped)",
+                                 name,
+                                 static_cast<int>(spec.state),
+                                 static_cast<int>(VirtualMachine::State::stopped)));
             spec.state = VirtualMachine::State::stopped;
         }