Merge branch 'master' into agama_config_return_codes

Author: teclator

live/src/agama-installer.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Mar 20 07:25:55 UTC 2026 - Josef Reidinger <jreidinger@suse.com>
+
+- Replace plymouth with blog-plymouth on s390x (bsc#1254326)
+
 -------------------------------------------------------------------
 Wed Mar 18 15:30:54 UTC 2026 - Josef Reidinger <jreidinger@suse.com>
 

live/src/agama-installer.kiwi

@@ -128,8 +128,11 @@
         <!-- image cleanup tool -->
         <package name="image-janitor"/>
         <!-- plymouth bsc#1248507 -->
-        <package name="plymouth" />
-        <package name="plymouth-dracut" />
+        <package name="plymouth" arch="aarch64,x86_64,ppc64le" />
+        <package name="plymouth-dracut" arch="aarch64,x86_64,ppc64le" />
+        <!-- and s390 specific plymouth bsc#1248507 -->
+        <package name="blog-plymouth" arch="s390x" />
+
     </packages>
 
     <!-- packages for local installation (desktop, browser, etc.) -->
@@ -155,7 +158,7 @@
         <package name="openSUSE-build-key"/>
         <package name="patterns-openSUSE-base"/>
         <package name="staging-build-key"/>
-        <package name="plymouth-branding-openSUSE" />
+        <package name="plymouth-branding-openSUSE" arch="aarch64,x86_64,ppc64le" />
     </packages>
     <!-- additional packages for the Leap distributions -->
     <packages type="image" profiles="Leap_16.1">

rust/agama-manager/src/actions.rs

@@ -294,12 +294,9 @@ impl SetConfigAction {
                 .await?;
         }
 
-        if let Some(network) = config.network.clone() {
-            self.progress
-                .call(progress::message::Next::new(Scope::Manager))
-                .await?;
-            self.network.update_config(network).await?;
-            self.network.apply().await?;
+        // FIXME: report the error in a proper way.
+        if let Err(error) = self.set_network(&config).await {
+            tracing::error!("Failed to set up the network: {error}");
         }
 
         match &product {
@@ -345,6 +342,20 @@ impl SetConfigAction {
 
         Ok(())
     }
+
+    async fn set_network(&self, config: &Config) -> Result<(), service::Error> {
+        let Some(network) = config.network.clone() else {
+            return Ok(());
+        };
+
+        self.progress
+            .call(progress::message::Next::new(Scope::Manager))
+            .await?;
+        self.network.update_config(network).await?;
+        self.network.apply().await?;
+
+        Ok(())
+    }
 }
 
 /// Implements the finish action.

rust/agama-manager/src/service.rs

@@ -730,7 +730,6 @@ impl MessageHandler<message::SetConfig> for Service {
     /// Sets the user configuration with the given values.
     async fn handle(&mut self, message: message::SetConfig) -> Result<(), Error> {
         checks::check_stage(&self.progress, Stage::Configuring).await?;
-        tracing::debug!("DEBUG: SetConfig handler (calling set_config)");
         self.set_config(message.config).await
     }
 }

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

@@ -210,12 +210,10 @@ async fn get_config(State(state): State<ServerState>) -> ServerResult<Json<Confi
     put,
     path = "/config",
     context_path = "/api/v2",
+    request_body(content = Value, description = "Configuration to apply."),
     responses(
         (status = 200, description = "The configuration was replaced. Other operations can be running in background."),
         (status = 400, description = "Not possible to replace the configuration.")
-    ),
-    params(
-        ("config" = Value, description = "Configuration to apply.")
     )
 )]
 async fn put_config(State(state): State<ServerState>, Json(json): Json<Value>) -> ServerResult<()> {
@@ -232,12 +230,10 @@ async fn put_config(State(state): State<ServerState>, Json(json): Json<Value>) -
     patch,
     path = "/config",
     context_path = "/api/v2",
+    request_body(content = Patch, description = "Changes in the configuration."),
     responses(
         (status = 200, description = "The configuration was patched. Other operations can be running in background."),
         (status = 400, description = "Not possible to patch the configuration.")
-    ),
-    params(
-        ("patch" = Patch, description = "Changes in the configuration.")
     )
 )]
 async fn patch_config(
@@ -410,13 +406,11 @@ async fn get_license(
     post,
     path = "/action",
     context_path = "/api/v2",
+    request_body(content = Action, description = "Description of the action to run."),
     responses(
         (status = 200, description = "Action successfully ran."),
         (status = 400, description = "Not possible to run the action.", body = Object),
         (status = 422, description = "Action blocked by backend state", body = Object)
-    ),
-    params(
-        ("action" = Action, description = "Description of the action to run."),
     )
 )]
 async fn run_action(

rust/package/agama.changes

@@ -1,10 +1,23 @@
 -------------------------------------------------------------------
-Thu Mar 19 15:46:19 UTC 2026 - Knut Anderssen <kanderssen@suse.com>
+Fri Mar 20 08:46:19 UTC 2026 - Knut Anderssen <kanderssen@suse.com>
 
 - Return error code when using "agama config generate",
   "agama config load" or "agama config validate" does not validate
   the given profile (bsc#1256951, gh#agama-project/agama#3304).
 
+-------------------------------------------------------------------
+Fri Mar 20 07:54:46 UTC 2026 - Knut Anderssen <kanderssen@suse.com>
+
+- Fix incorrect openAPI parameters (gh#agama-project/agama#3299).
+  - Do not define params for POST '/api/v2/action'
+  - Do not define params for PUT and PATCH '/api/v2/config
+
+-------------------------------------------------------------------
+Thu Mar 19 21:11:29 UTC 2026 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
+
+- Continue loading the configuration even if there is a network setup
+  error (gh#agama-project/agama#3306).
+
 -------------------------------------------------------------------
 Wed Mar 18 22:29:10 UTC 2026 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
 

service/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    agama-yast (19.devel14.752a116e9)
+    agama-yast (19.devel25.2db95cd44)
       cfa (~> 1.0.2)
       cfa_grub2 (~> 2.0.0)
       cheetah (~> 1.0.0)

service/lib/agama/autoyast/connections_reader.rb

@@ -63,8 +63,11 @@ def ipv6?
       # @return [Hash]
       def read_connection(interface)
         conn = {}
-        conn["interface"] = interface.device unless interface.device.to_s.empty?
-        conn["id"] = interface.name if interface.name
+        if !interface.device.to_s.empty?
+          conn["interface"] = interface.device
+          conn["id"] = interface.device
+        end
+        conn["id"] = interface.name unless interface.name.to_s.empty?
 
         addresses = read_addresses(interface)
         method4, method6 = read_methods(interface)

service/package/rubygem-agama-yast.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Mar 19 21:12:15 UTC 2026 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
+
+- AutoYaST support: use the connection "device" as fallback for network
+  connections with no "name" (gh#agama-project/agama#3306).
+
 -------------------------------------------------------------------
 Wed Mar 18 23:44:14 UTC 2026 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
 

service/test/agama/autoyast/connections_reader_test.rb

@@ -49,6 +49,32 @@
       end
     end
 
+    context "when the connection has a \"device\"" do
+      let(:interfaces) do
+        [{ "device" => "eth1" }]
+      end
+
+      it "uses the \"device\" as \"id\" and \"interface\"" do
+        connections = subject.read["connections"]
+        conn = connections.first
+        expect(conn["id"]).to eq("eth1")
+        expect(conn["interface"]).to eq("eth1")
+      end
+    end
+
+    context "when the connection has a \"name\"" do
+      let(:interfaces) do
+        [{ "name" => "eth0" }]
+      end
+
+      it "uses the \"name\" as \"id\"" do
+        connections = subject.read["connections"]
+        conn = connections.first
+        expect(conn["id"]).to eq("eth0")
+        expect(conn["interface"]).to be_nil
+      end
+    end
+
     context "when bootproto is set to DHCP" do
       it "sets method4 to 'auto'" do
         connections = subject.read["connections"]