The branch, master has been updated
via e2fe464158b bootstrap: fix bootstrap in opensuse container
from 38b2428d376 ctdb-daemon: Hex encode key before logging
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e2fe464158bf0552cbaf5fdc5120e1ef8fcdd451
Author: Michael Adam <[email protected]>
Date: Mon Feb 9 18:17:13 2026 +0100
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 <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
Autobuild-User(master): Andreas Schneider <[email protected]>
Autobuild-Date(master): Wed Feb 11 10:30:26 UTC 2026 on atb-devel-224
-----------------------------------------------------------------------
Summary of changes:
.gitlab-ci-main.yml | 2 +-
bootstrap/config.py | 1 +
bootstrap/generated-dists/opensuse155/bootstrap.sh | 1 +
bootstrap/sha1sum.txt | 2 +-
4 files changed, 4 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index c66b343fcad..173ee7207d4 100644
--- 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 08d60dcc45b..3e38c040f2f 100644
--- 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 28b41df7fb9..e3705026936 100755
--- 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 a69db3e7659..97aba808b7e 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-336927a79f09b3eb729c64872bf4eca3e2f6761f
+03fd828d76b390ce14e62919fd29cb06dc31b495
--
Samba Shared Repository
