Skip to content

Commit 466e516

Browse files
committed
ci: fix Slurm install for Fedora merged-usr layout
Merge sbin into bin in the DESTDIR staging area before COPY, since Fedora's /usr/sbin is a symlink to /usr/bin.
1 parent 7dbb957 commit 466e516

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

utils/ci/Dockerfile.fedora

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,13 @@ RUN tar xf slurm.tar.bz2 && \
110110
--with-systemdsystemunitdir=/usr/lib/systemd/system && \
111111
make -j$(nproc) && \
112112
DESTDIR=/slurm-install make install && \
113-
mkdir -p /slurm-install/etc
113+
mkdir -p /slurm-install/etc && \
114+
# Fedora uses merged-usr (/usr/sbin -> /usr/bin). Merge sbin into bin
115+
# so COPY does not try to overwrite the symlink with a directory.
116+
if [ -d /slurm-install/usr/sbin ]; then \
117+
cp -a /slurm-install/usr/sbin/* /slurm-install/usr/bin/ && \
118+
rm -rf /slurm-install/usr/sbin; \
119+
fi
114120

115121
# Stage 5: sind-compatible Slurm node image for integration testing.
116122
# Combines the ODC build environment with a source-built Slurm.

0 commit comments

Comments
 (0)