diff options
| author | Roger Leigh <rleigh@debian.org> | 2010-10-22 22:06:54 +0100 |
|---|---|---|
| committer | Roger Leigh <rleigh@debian.org> | 2011-01-16 21:56:40 +0000 |
| commit | 3d2c6e4b7c1db73ddc6961b9136ed74ac6b39190 (patch) | |
| tree | c42ffaa42f717d4fcdc4ac5e6b96ff42f774ddd8 /etc | |
| parent | 7b3e160bfca2fe7f280ba52b1a79b5fb207f65d9 (diff) | |
| download | schroot-3d2c6e4b7c1db73ddc6961b9136ed74ac6b39190.tar.gz | |
setup.d: 10mount: Don't special case file chroot purging
Now that 05file unpacks tarballs into a separate directory,
10mount should not skip purging the mount directory, since
it won't otherwise be cleaned up.
Diffstat (limited to 'etc')
| -rwxr-xr-x | etc/setup.d/10mount | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/etc/setup.d/10mount b/etc/setup.d/10mount index b6c5ebce..29636d11 100755 --- a/etc/setup.d/10mount +++ b/etc/setup.d/10mount @@ -210,11 +210,9 @@ if [ "$CHROOT_TYPE" = "directory" ] \ # Purge mount location. # The contents of file chroots are purged separately, because # we might want to repack the contents. - if [ "$CHROOT_TYPE" != "file" ]; then - if echo "$CHROOT_MOUNT_LOCATION" | grep -q "^$MOUNT_DIR/"; then - if [ -d "$CHROOT_MOUNT_LOCATION" ]; then - rmdir "$CHROOT_MOUNT_LOCATION" - fi + if echo "$CHROOT_MOUNT_LOCATION" | grep -q "^$MOUNT_DIR/"; then + if [ -d "$CHROOT_MOUNT_LOCATION" ]; then + rmdir "$CHROOT_MOUNT_LOCATION" fi fi |