Do not check the installer phase in the CLI

rust/agama-cli/src/lib.rs

@@ -142,12 +142,12 @@ async fn reboot(manager: &ManagerClient<'_>) -> anyhow::Result<()> {
 
     // Make sure that the manager is ready
     manager.wait().await?;
-
-    let phase = manager.current_installation_phase().await?;
-    match phase {
-        agama_lib::manager::InstallationPhase::Finish => Ok(manager.finish().await?),
-        _ => Err(CliError::NotFinished)?,
+    let finished = manager.finish().await?;
+    if !manager.finish().await? {
+        eprintln!("Cannot reboot the system");
+        return Err(CliError::NotFinished)?;
     }
+    Ok(())
 }
 
 async fn show_progress() -> Result<(), ServiceError> {

rust/agama-lib/src/manager.rs

@@ -117,7 +117,7 @@ impl<'a> ManagerClient<'a> {
     }
 
     /// Executes the after installation tasks.
-    pub async fn finish(&self) -> Result<(), ServiceError> {
+    pub async fn finish(&self) -> Result<bool, ServiceError> {
         Ok(self.manager_proxy.finish().await?)
     }
 

rust/agama-lib/src/proxies/manager1.rs

@@ -36,7 +36,7 @@ pub trait Manager1 {
     fn commit(&self) -> zbus::Result<()>;
 
     /// Finish method
-    fn finish(&self) -> zbus::Result<()>;
+    fn finish(&self) -> zbus::Result<bool>;
 
     /// Probe method
     fn probe(&self) -> zbus::Result<()>;

rust/agama-server/src/manager/web.rs

@@ -179,9 +179,8 @@ async fn install_action(State(state): State<ManagerState<'_>>) -> Result<(), Err
       (status = 200, description = "The installation tasks are executed.")
     )
 )]
-async fn finish_action(State(state): State<ManagerState<'_>>) -> Result<(), Error> {
-    state.manager.finish().await?;
-    Ok(())
+async fn finish_action(State(state): State<ManagerState<'_>>) -> Result<Json<bool>, Error> {
+    Ok(Json(state.manager.finish().await?))
 }
 
 /// Returns the manager status.

service/lib/agama/dbus/manager.rb

@@ -65,7 +65,7 @@ def initialize(backend, logger)
         dbus_method(:Commit, "") { install_phase }
         dbus_method(:CanInstall, "out result:b") { can_install? }
         dbus_method(:CollectLogs, "out tarball_filesystem_path:s") { collect_logs }
-        dbus_method(:Finish, "") { finish_phase }
+        dbus_method(:Finish, "out result:b") { finish_phase }
         dbus_reader :installation_phases, "aa{sv}"
         dbus_reader :current_installation_phase, "u"
         dbus_reader :iguana_backend, "b"
@@ -101,6 +101,8 @@ def collect_logs
       end
 
       # Last action for the installer
+      #
+      # @return [Boolean]
       def finish_phase
         backend.finish_installation
       end

service/lib/agama/manager.rb

@@ -249,6 +249,8 @@ def collect_logs(path: nil)
     end
 
     # Whatever has to be done at the end of installation
+    #
+    # @return [Boolean]
     def finish_installation
       logs = collect_logs(path: "/tmp/var/logs/")
 
@@ -267,7 +269,7 @@ def finish_installation
 
       logger.info("Finishing installation with #{cmd}")
 
-      system(cmd)
+      !!system(cmd)
     end
 
     # Says whether running on iguana or not