From abde1e6281ff1403e67c6f573dd10be4c892fb9a Mon Sep 17 00:00:00 2001
From: Joe Buehler <jbuehler@spirentcom.com>
Date: Mon, 3 Oct 2005 04:13:26 +0000
Subject: [PATCH] linux-rc-wait-for-salvager-20051002

FIXES 21754

rc file hack to wait for salvage to finish
---
 src/afsd/afs.conf.linux | 4 ++++
 src/afsd/afs.rc.linux   | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/src/afsd/afs.conf.linux b/src/afsd/afs.conf.linux
index be41530c4..456d0732e 100644
--- a/src/afsd/afs.conf.linux
+++ b/src/afsd/afs.conf.linux
@@ -79,6 +79,10 @@ CACHESIZE=AUTOMATIC
 OPTIONS=AUTOMATIC
 #OPTIONS=$SMALL
 
+# force startup script to wait for salvage to finish before proceeding
+# with machine boot
+WAIT_FOR_SALVAGE=no
+
 # you should never need to change these settings
 AFSDIR=/afs
 CACHEDIR=/usr/vice/cache
diff --git a/src/afsd/afs.rc.linux b/src/afsd/afs.rc.linux
index 5b2405df8..9591579d0 100644
--- a/src/afsd/afs.rc.linux
+++ b/src/afsd/afs.rc.linux
@@ -282,6 +282,14 @@ case "$1" in
 	if  is_on $AFS_SERVER && test -x /usr/afs/bin/bosserver  ; then
 		/usr/afs/bin/bosserver 
 		test "$afs_rh" && touch /var/lock/subsys/afs
+		if is_on $WAIT_FOR_SALVAGE; then
+			# wait for fileserver to finish salvaging
+			sleep 10
+			while /usr/bin/bos status localhost fs 2>&1 | grep 'Auxiliary.*salvaging'; do
+				echo "Waiting for salvager to finish..... "
+				sleep 10
+			done
+		fi
 	fi
 
 	# Start AFS client
-- 
2.39.5