bootstrap: fix bootstrap in opensuse container

bootstrap.sh was failing in an opensuse container due to a conflict
of which with the pre-installed busybox-which package.

forcing resolution with zypper fixes the bootstrapping.

Thanks to Andreas Scheider for the hint!

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Wed Feb 11 10:30:26 UTC 2026 on atb-devel-224

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index c66b343fcad24f7847d736150618386254582f59..173ee7207d490a474e82cefe4939ab58a0482243 100644 (file)
--- a/.gitlab-ci-main.yml
+++ b/.gitlab-ci-main.yml
@@ -47,7 +47,7 @@ variables:
   # Set this to the contents of bootstrap/sha1sum.txt
   # which is generated by bootstrap/template.py --render
   #
-  SAMBA_CI_CONTAINER_TAG: 336927a79f09b3eb729c64872bf4eca3e2f6761f
+  SAMBA_CI_CONTAINER_TAG: 03fd828d76b390ce14e62919fd29cb06dc31b495
   #
   # We use the ubuntu2204 image as default as
   # it matches what we have on atb-devel-224

diff --git a/bootstrap/config.py b/bootstrap/config.py
index 08d60dcc45b2aea3da6d4d6720478fa28a99e819..3e38c040f2fe68b0eba574fd7a325d5ce797f6ac 100644 (file)
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -332,6 +332,7 @@ set -xueo pipefail
 zypper --non-interactive refresh
 zypper --non-interactive update
 zypper --non-interactive install \
+    --force-resolution \
     --no-recommends \
     system-user-nobody \
     {pkgs}

diff --git a/bootstrap/generated-dists/opensuse155/bootstrap.sh b/bootstrap/generated-dists/opensuse155/bootstrap.sh
index 28b41df7fb9a0f3a6c2e54a95b807a6c6cabcf60..e3705026936216276eb804e9e3fffdcd83815327 100755 (executable)
--- a/bootstrap/generated-dists/opensuse155/bootstrap.sh
+++ b/bootstrap/generated-dists/opensuse155/bootstrap.sh
@@ -10,6 +10,7 @@ set -xueo pipefail
 zypper --non-interactive refresh
 zypper --non-interactive update
 zypper --non-interactive install \
+    --force-resolution \
     --no-recommends \
     system-user-nobody \
     ShellCheck \

diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index a69db3e76599448d516271007caacbe0771cabf0..97aba808b7eb603ce2570171635a25357717defc 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-336927a79f09b3eb729c64872bf4eca3e2f6761f
+03fd828d76b390ce14e62919fd29cb06dc31b495