From ea7ec4fe4a44cb33c5cea95cb0cf1a9015da9986 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= <lslezak@suse.com>
Date: Fri, 8 Dec 2023 09:43:00 +0100
Subject: [PATCH 1/2] The setup-service.sh script has been renamed to
 setup-services.sh

---
 .github/workflows/ci-integration-tests.yml | 4 ++--
 rust/agama-cli/doc/backend-for-testing.md  | 2 +-
 service/bin/agamactl                       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci-integration-tests.yml b/.github/workflows/ci-integration-tests.yml
index 4b377c15d3..1c1aa53f3f 100644
--- a/.github/workflows/ci-integration-tests.yml
+++ b/.github/workflows/ci-integration-tests.yml
@@ -38,13 +38,13 @@ jobs:
     - name: Install the frontend
       run:  podman exec agama bash -c "ln -snfv /checkout/web/dist /usr/share/cockpit/agama"
 
-    # ./setup-service.sh will try setting up cockpit.socket
+    # ./setup-services.sh will try setting up cockpit.socket
     # which has a login page, so this local-session needs to be first
     - name: Start Cockpit service
       run:  podman exec --detach agama /usr/libexec/cockpit-ws --local-session=/usr/bin/cockpit-bridge
 
     - name: Setup service
-      run:  podman exec agama bash -c "cd /checkout; ./setup-service.sh"
+      run:  podman exec agama bash -c "cd /checkout; ./setup-services.sh"
 
     - name: Set a testing Agama configuration
       # use just one product, it skips the product selection at the beginning
diff --git a/rust/agama-cli/doc/backend-for-testing.md b/rust/agama-cli/doc/backend-for-testing.md
index 41c34529a6..a5612620ac 100644
--- a/rust/agama-cli/doc/backend-for-testing.md
+++ b/rust/agama-cli/doc/backend-for-testing.md
@@ -63,7 +63,7 @@ podman run --name ${CNAME?} \
 # shortcut for the following
 CEXEC="podman exec ${CNAME?} bash -c"
 
-${CEXEC?} "cd /checkout && ./setup-service.sh"
+${CEXEC?} "cd /checkout && ./setup-services.sh"
 
 # Optional: explicit service start using a separate log file
 ${CEXEC?} "cd /checkout/service && (bundle exec bin/agamactl > service.log 2>&1 &)"
diff --git a/service/bin/agamactl b/service/bin/agamactl
index 1fbd0f3402..3edc3c09ec 100755
--- a/service/bin/agamactl
+++ b/service/bin/agamactl
@@ -73,7 +73,7 @@ if ARGV.empty?
   puts "ERROR: Using 'agamactl' to start all services no longer works."
   puts "NOTE: It had race conditions all along and now there's a Rust service it can't reach too."
   puts "NOTE: Use `systemctl start agama.service` instead"
-  puts "NOTE: which is setup by a) RPMs b) ./setup-service.sh"
+  puts "NOTE: which is setup by a) RPMs b) ./setup-services.sh"
   exit 1
 elsif ["-h", "--help"].include?(ARGV[0])
   me = $PROGRAM_NAME

From 169afc91eb07186be1b8e272974cdf45203edf21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= <lslezak@suse.com>
Date: Fri, 8 Dec 2023 10:06:50 +0100
Subject: [PATCH 2/2] install the s390 packages conditionally

---
 setup-services.sh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/setup-services.sh b/setup-services.sh
index cc32797f70..2a85303136 100755
--- a/setup-services.sh
+++ b/setup-services.sh
@@ -86,11 +86,13 @@ $SUDO zypper --non-interactive --gpg-auto-import-keys install \
   udftools \
   xfsprogs || exit 1
 
-# Install s390 packages (do not exit on failure).
-$SUDO zypper --non-interactive --gpg-auto-import-keys install \
-  yast2-s390 \
-  yast2-reipl \
-  yast2-cio
+# Install s390 packages
+if [ $(uname -m) == "s390x" ]; then
+  $SUDO zypper --non-interactive --gpg-auto-import-keys install \
+    yast2-s390 \
+    yast2-reipl \
+    yast2-cio
+fi
 
 # Rubygem dependencies
 (