[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: refactoring

[Holger Levsen (@holger)]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
b78f7531 by Holger Levsen at 2023-01-28T16:38:11+01:00
refactoring

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
a68ae0fd by Holger Levsen at 2023-01-28T16:39:25+01:00
chroot-run: also cleanup /dev/pts and /dev mountpoints

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


1 changed file:

- bin/chroot-run.sh


Changes:

=====================================
bin/chroot-run.sh
=====================================
@@ -168,12 +168,10 @@ cleanup() {
 	#
 	# actually cleanup
 	#
-	if [ -d $CHROOT_TARGET/proc ]; then
-		sudo umount -l $CHROOT_TARGET/proc || fuser -mv $CHROOT_TARGET/proc
-	fi
-	if [ -d $CHROOT_TARGET/testrun ]; then
-		sudo umount -l $CHROOT_TARGET/testrun || fuser -mv $CHROOT_TARGET/testrun
-	fi
+	for CLEAN_TARGET in dev/pts dev proc testrun ; do
+		if [ -d $CHROOT_TARGET/${CLEAN_TARGET} ]; then
+			sudo umount -l $CHROOT_TARGET/${CLEAN_TARGET} || fuser -mv $CHROOT_TARGET/${CLEAN_TARGET}
+		fi
 	if [ -d $CHROOT_TARGET ]; then
 		sudo rm -rf --one-file-system $CHROOT_TARGET || fuser -mv $CHROOT_TARGET
 	fi



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/f18ba08962483a87cf9c707f74f5b8b2ee7e26ee...a68ae0fd2364290c75e0aafe431640f7999e34bf

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/f18ba08962483a87cf9c707f74f5b8b2ee7e26ee...a68ae0fd2364290c75e0aafe431640f7999e34bf
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20230128/6fcbe15e/attachment-0001.htm>