Reorg: move master_shutdown.sh to sbin

This changes its path inside the container to /usr/local/sbin/master_shutdown.sh
opensciencegrid · Nov 9, 2023 · 9462c6a · 9462c6a
1 parent 77de141
commit 9462c6a
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 2 deletions.
diff --git a/50-main.config b/50-main.config
@@ -89,7 +89,7 @@ STARTD_NOCLAIM_SHUTDOWN = $(ACCEPT_IDLE_MINUTES) * 60
 MASTER.DAEMON_SHUTDOWN_FAST = ((STARTD_StartTime == 0) && ((CurrentTime - DaemonStartTime) > 60)) || (time() > GLIDEIN_ToDie)
 
 # callout to a script when the master exits
-DEFAULT_MASTER_SHUTDOWN_SCRIPT = /etc/condor/master_shutdown.sh
+DEFAULT_MASTER_SHUTDOWN_SCRIPT = /usr/local/sbin/master_shutdown.sh
 
 # Identify pilot container jobs for gratia-probe detection
 IsOsgVoContainer = True

diff --git a/Dockerfile b/Dockerfile
@@ -140,7 +140,6 @@ COPY supervisord.conf /etc/supervisord.conf
 COPY ldconfig_wrapper.sh /usr/local/bin/ldconfig
 COPY 10-ldconfig-cache.sh /etc/osg/image-init.d/
 
-COPY master_shutdown.sh /etc/condor/
 COPY 10-setup-htcondor.sh /etc/osg/image-init.d/
 COPY 10-cleanup-htcondor.sh /etc/osg/image-cleanup.d/
 COPY 10-htcondor.conf 10-rsyslogd.conf /etc/supervisord.d/

diff --git a/master_shutdown.sh → sbin/master_shutdown.sh b/master_shutdown.sh → sbin/master_shutdown.sh