Merge remote-tracking branch 'origin/master' into disable-remote-access

Author: lslezak

.github/workflows/ci-rust.yml

@@ -85,6 +85,7 @@ jobs:
     - name: Install required packages
       run: zypper --non-interactive install --allow-downgrade
         clang-devel
+        findutils
         gcc-c++
         git
         libopenssl-3-devel
@@ -117,8 +118,13 @@ jobs:
           rust/target
         key: ${{ runner.os }}-cargo-clippy-${{ hashFiles('**/Cargo.lock') }}
 
+    - name: Run Clang Format check for the C/C++ zypp bindings
+      run: make check
+      working-directory: ./rust/zypp-agama/zypp-agama-sys/c-layer
+
     - name: Run clippy linter
-      run: cargo clippy
+      # deny warnings: clippy or rustc warnings will fail the build
+      run: cargo clippy -- -D warnings
       working-directory: ./rust
 
   tests:

rust/agama-autoinstall/src/main.rs

@@ -22,7 +22,10 @@ use std::{process::exit, time::Duration};
 
 use agama_autoinstall::{ConfigAutoLoader, ScriptsRunner};
 use agama_lib::{auth::AuthToken, http::BaseHTTPClient, manager::ManagerHTTPClient};
-use agama_utils::{api::status::Stage, kernel_cmdline::KernelCmdline};
+use agama_utils::{
+    api::{status::Stage, FinishMethod},
+    kernel_cmdline::KernelCmdline,
+};
 use anyhow::anyhow;
 use tokio::time::sleep;
 
@@ -93,7 +96,8 @@ async fn main() -> anyhow::Result<()> {
         }
     }
 
-    manager_client.finish(None).await?;
+    let method = FinishMethod::from_kernel_cmdline().unwrap_or(FinishMethod::Reboot);
+    manager_client.finish(method).await?;
 
     Ok(())
 }

rust/agama-cli/src/lib.rs

@@ -147,6 +147,8 @@ async fn finish(
 ) -> anyhow::Result<()> {
     wait_until_idle(monitor.clone()).await?;
 
+    let method = method
+        .unwrap_or_else(|| FinishMethod::from_kernel_cmdline().unwrap_or(FinishMethod::Reboot));
     manager.finish(method).await?;
     Ok(())
 }

rust/agama-lib/src/manager/http_client.rs

@@ -67,7 +67,7 @@ impl ManagerHTTPClient {
     /// Finishes the installation.
     ///
     /// * `method`: halt, reboot, stop or poweroff the system.
-    pub async fn finish(&self, method: Option<FinishMethod>) -> Result<(), ManagerHTTPClientError> {
+    pub async fn finish(&self, method: FinishMethod) -> Result<(), ManagerHTTPClientError> {
         let action = api::Action::Finish(method);
         self.client.post_void("/v2/action", &action).await?;
         Ok(())