diff options
| author | Holger Levsen <holger@layer-acht.org> | 2015-09-10 10:54:45 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-09-10 10:54:45 +0200 |
| commit | abf5265550b3aa79a498348a398ae8324a1731ad (patch) | |
| tree | 976f00185dc41059c598c2d99539b4766e9d2564 /bin | |
| parent | d80aad38d413038f5fc788b5989d583883430405 (diff) | |
| download | jenkins.debian.net-abf5265550b3aa79a498348a398ae8324a1731ad.tar.xz | |
reproducible: remove distracting fuser call
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/schroot-create.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/bin/schroot-create.sh b/bin/schroot-create.sh index 1027d67e..c3ffe469 100755 --- a/bin/schroot-create.sh +++ b/bin/schroot-create.sh @@ -183,7 +183,7 @@ bootstrap() { cleanup() { if [ -d $CHROOT_TARGET ]; then - sudo rm -rf --one-file-system $CHROOT_TARGET || ( echo "Warning: $CHROOT_TARGET could not be fully removed on forced cleanup." ; fuser -mv $CHROOT_TARGET ; ls $CHROOT_TARGET -la ) + sudo rm -rf --one-file-system $CHROOT_TARGET || ( echo "Warning: $CHROOT_TARGET could not be fully removed on forced cleanup." ; ls $CHROOT_TARGET -la ) fi rm -f $TMPLOG } @@ -204,8 +204,7 @@ echo "$(date -u ) - renaming $CHROOT_TARGET to $SCHROOT_BASE/$TARGET" sudo mv $CHROOT_TARGET $SCHROOT_BASE/"$TARGET" if [ -d $SCHROOT_BASE/"$TARGET"-"$rand" ] ; then - sudo rm -rf --one-file-system $SCHROOT_BASE/"$TARGET"-"$rand" || ( echo "Warning: $SCHROOT_BASE/${TARGET}-$rand could not be fully removed." ; fuser -mv $SCHROOT_BASE/${TARGET}-$rand ; ls $SCHROOT_BASE/${TARGET}-$rand -la ) - # idea: ignore if 0 files are in there… + sudo rm -rf --one-file-system $SCHROOT_BASE/"$TARGET"-"$rand" || ( echo "Warning: $SCHROOT_BASE/${TARGET}-$rand could not be fully removed." ; ls $SCHROOT_BASE/${TARGET}-$rand -la ) fi # write the schroot config |