Skip to content

Commit ec55157

Browse files
committed
Add Scientific Linux OS detection (HTCONDOR-503)
1 parent 85ec1fc commit ec55157

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,10 @@ RUN patch -d / -p0 < /tmp/bosco_cluster_xtrace.patch
106106
COPY hosted-ce/overrides/skip_key_copy.patch /tmp
107107
RUN patch -d / -p0 < /tmp/skip_key_copy.patch
108108

109+
# Add Scientific Linux OS detection to bosco_cluster (HTCONDOR-503)
110+
COPY hosted-ce/overrides/HTCONDOR-503.add-sl-support.patch /tmp
111+
RUN patch -d / -p0 < /tmp/HTCONDOR-503.add-sl-support.patch
112+
109113
# Allow the Gridmanager to specify 'batch_gahp' for its remote command
110114
# Required for HTCondor 9.0.0 on the CE and Bosco 1.3 usage
111115
# Can be dropped when HTCONDOR-451 has been fixed and released in the OSG
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- /usr/bin/bosco_cluster
2+
+++ /usr/bin/bosco_cluster
3+
@@ -288,7 +288,7 @@ ssh_detect_linux_distro () {
4+
major_ver="${ver%%.*}"
5+
6+
case "$dist" in
7+
- (rhel|centos)
8+
+ (rhel|centos|scientific)
9+
echo "CentOS${major_ver}" ;;
10+
debian)
11+
echo "Debian${major_ver}" ;;

0 commit comments

Comments
 (0)