From 0259bba352e835936fe154e0651af621069727e3 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Thu, 29 Nov 2012 16:38:52 +0100 Subject: Use rm -rf --one-file-system to delete chroots, thanks to Andreas Beckmann for the idea. --- TODO | 2 +- bin/chroot_tester.sh | 2 +- bin/d-i_builds.sh | 2 +- bin/housekeeping.sh | 2 ++ etc/sudoers.d/jenkins | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/TODO b/TODO index d2e00538..a62eb618 100644 --- a/TODO +++ b/TODO @@ -71,7 +71,7 @@ As documented in manual/doc/translations_po.txt: * inform debian-devel@ ---- - for "bloated" squeeze-wheezy (or whatever) upgrade tests: debootstrap + apt-get install openoffice.org gnome kde-plasma-desktop xfce4 lxde vlc evince iceweasel chromium cups build-essential devscripts mplayer wine virtualbox + for "bloated" squeeze-wheezy (or whatever) upgrade tests: debootstrap + apt-get install openoffice.org gnome kde-plasma-desktop xfce4 lxde vlc evince iceweasel chromium cups build-essential devscripts mplayer wine virtualbox texlive-full asciidoc anything else for that list? build deps for all of those? i'll try that, thanks diff --git a/bin/chroot_tester.sh b/bin/chroot_tester.sh index 83c4dd12..50e4add5 100755 --- a/bin/chroot_tester.sh +++ b/bin/chroot_tester.sh @@ -49,7 +49,7 @@ cleanup_all() { sudo umount -l $CHROOT_TARGET/run/lock || true sudo umount -l $CHROOT_TARGET/run/shm || true sudo umount -l $CHROOT_TARGET/run || true - sudo rm -rf $CHROOT_TARGET + sudo rm -rf --one-file-system $CHROOT_TARGET } execute_ctmpfile() { diff --git a/bin/d-i_builds.sh b/bin/d-i_builds.sh index 79938b7f..516f427a 100755 --- a/bin/d-i_builds.sh +++ b/bin/d-i_builds.sh @@ -45,7 +45,7 @@ cleanup_all() { sudo umount -l $CHROOT_TARGET/run/lock || true sudo umount -l $CHROOT_TARGET/run/shm || true sudo umount -l $CHROOT_TARGET/run || true - sudo rm -rf $CHROOT_TARGET + sudo rm -rf --one-file-system $CHROOT_TARGET } execute_ctmpfile() { diff --git a/bin/housekeeping.sh b/bin/housekeeping.sh index 0e32a1d1..50ae330b 100755 --- a/bin/housekeeping.sh +++ b/bin/housekeeping.sh @@ -33,5 +33,7 @@ if [ "$HOUSE" != "" ] ; then exit 1 fi +df |grep tmpfs > /dev/null || echo "Warning: no tmpfs mounts in use. Please investigate the host system." + echo "No problems found, all seems good." figlet "Ok." diff --git a/etc/sudoers.d/jenkins b/etc/sudoers.d/jenkins index 584284b3..e0d69acf 100755 --- a/etc/sudoers.d/jenkins +++ b/etc/sudoers.d/jenkins @@ -1,4 +1,4 @@ -jenkins ALL= NOPASSWD: /usr/sbin/debootstrap *, NOPASSWD: /usr/sbin/chroot /chroots/*, NOPASSWD: /bin/rm -rf /chroots/*, NOPASSWD: /bin/umount -l /chroots/*, NOPASSWD: /usr/bin/du *, SETENV: NOPASSWD: /usr/sbin/pbuilder * +jenkins ALL= NOPASSWD: /usr/sbin/debootstrap *, NOPASSWD: /usr/sbin/chroot /chroots/*, NOPASSWD: /bin/rm -rf --one-file-system /chroots/*, NOPASSWD: /bin/umount -l /chroots/*, NOPASSWD: /usr/bin/du *, SETENV: NOPASSWD: /usr/sbin/pbuilder * # keep these environment variables Defaults env_keep += "http_proxy", env_reset -- cgit v1.2.3-70-g09d2