refactor: move cleanup_schroot_sessions() to common_functions.sh

3 files changed, 22 insertions, 24 deletions

diff --git a/bin/common-functions.sh b/bin/common-functions.sh
index 043ef5e7..8118812f 100755
--- a/bin/common-functions.sh
+++ b/bin/common-functions.sh
@@ -127,3 +127,24 @@ publish_changes_to_userContent(){
 	fi
 }
 
+cleanup_schroot_sessions() {
+	echo
+	local RESULT=""
+	for loop in $(seq 0 40) ; do
+		# first, check if no process using "schroot" is running, if thats the case, loop through all schroot sessions:
+		pgrep -f "schroot --directory" || for i in $(schroot --all-sessions -l ) ; do
+			# then, check that schroot is still not run, and then delete the session
+			pgrep -f "schroot --directory" || schroot -e -c $i
+		done
+		RESULT=$(schroot --all-sessions -l)
+		if [ -z "$RESULT" ] ; then
+			echo "No schroot sessions in use atm..."
+			echo
+			break
+		fi
+		echo "$(date -u) - schroot session cleanup loop $loop"
+		sleep 15
+	done
+	echo
+}
+
diff --git a/bin/reproducible_maintenance.sh b/bin/reproducible_maintenance.sh
index 156e6b79..0b2d9aae 100755
--- a/bin/reproducible_maintenance.sh
+++ b/bin/reproducible_maintenance.sh
@@ -114,12 +114,7 @@ fi
 
 # remove old and unused schroot sessions
 echo "$(date -u) - Removing unused schroot sessions."
-pgrep -f "schroot --directory" || for i in $(schroot --all-sessions -l ) ; do pgrep -f "schroot --directory" || schroot -e -c $i ; done
-# to explain this:
-# first, check if no process using "schroot" is running...
-# then loop through all schroot sessions
-# for each session
-# check that schroot is still not run, and then, delete the session
+cleanup_schroot_sessions
 
 # find old schroots
 echo "$(date -u) - Removing old schroots."
diff --git a/bin/schroot-create.sh b/bin/schroot-create.sh
index 9999ca60..befd694b 100755
--- a/bin/schroot-create.sh
+++ b/bin/schroot-create.sh
@@ -182,24 +182,6 @@ bootstrap() {
 	fi
 }
 
-cleanup_schroot_sessions() {
-	echo
-	# FIXME: if this works well, move to _common.sh and use the same function from _maintenance.sh
-	local RESULT=""
-	for loop in $(seq 0 40) ; do
-		pgrep -f "schroot --directory" || for i in $(schroot --all-sessions -l ) ; do pgrep -f "schroot --directory" || schroot -e -c $i ; done
-		RESULT=$(schroot --all-sessions -l)
-		if [ -z "$RESULT" ] ; then
-			echo "No schroot sessions in use atm..."
-			echo
-			break
-		fi
-		echo "$(date -u) - schroot session cleanup loop $loop"
-		sleep 15
-	done
-	echo
-}
-
 cleanup() {
 	if [ -d $SCHROOT_TARGET ]; then
 		sudo rm -rf --one-file-system $SCHROOT_TARGET || ( echo "Warning: $SCHROOT_TARGET could not be fully removed on forced cleanup." ; ls $SCHROOT_TARGET -la )