Bug#369626: [Buildd-tools-devel] Bug#369626: schroot: rm -rf in file chroot cleanup destroys real /home if umount fails

[Roger Leigh]

tags 369626 + patch fixed-upstream pending
thanks

Roger Leigh <rleigh at whinlatter.ukfsn.org> writes:

> I've attached a patch for this.  Note: it's not yet tested; this is
> just to give you an idea of what I'm thinking of as a solution.  If
> the testing works out, and you are happy with it, I'll include this in
> the next release.

I have attached a new patch.  This has had proper testing, and I have
fixed a number of issues with the previous patch.  This patch is OK to
test, and I will make a new release over the weekend if you are happy
with it.

This has been committed into upstream SVN, revision 699.
http://svn.debian.org/wsvn/buildd-tools/trunk/schroot?rev=0&sc=1
http://svn.debian.org/wsvn/buildd-tools?op=comp&compare%5B%5D=%2Ftrunk%2Fschroot@594&compare%5B%5D=%2Ftrunk%2Fschroot@699


Regards,
Roger


 diffstat ~/patches/schroot-safecleanup2.patch
 ChangeLog                             |   47 ++++++++
 NEWS                                  |   10 +
 debian/changelog                      |    3
 po/POTFILES.in                        |    3
 po/en_GB.po                           |  117 ++++++++++++++-------
 po/sv.po                              |  118 ++++++++++++++--------
 po/vi.po                              |  119 ++++++++++++++--------
 schroot/Makefile.am                   |   10 +
 schroot/sbuild-chroot-block-device.cc |    3
 schroot/sbuild-chroot-block-device.h  |    9 -
 schroot/sbuild-chroot-file.cc         |    5
 schroot/sbuild-chroot-file.h          |    9 -
 schroot/sbuild-chroot-lvm-snapshot.cc |    5
 schroot/sbuild-chroot-lvm-snapshot.h  |    9 -
 schroot/sbuild-chroot-plain.cc        |    5
 schroot/sbuild-chroot-plain.h         |    9 -
 schroot/sbuild-chroot.cc              |   13 ++
 schroot/sbuild-chroot.h               |   42 +++++++
 schroot/sbuild-session.cc             |    6 -
 schroot/sbuild-util.cc                |   13 ++
 schroot/sbuild-util.h                 |   12 ++
 schroot/schroot-listmounts-options.cc |   83 +++++++++++++++
 schroot/schroot-listmounts-options.h  |   59 +++++++++++
 schroot/schroot-listmounts.cc         |  181 ++++++++++++++++++++++++++++++++++
 schroot/setup/05file                  |   15 ++
 schroot/setup/10mount                 |   32 +-----
 test/sbuild-chroot.cc                 |    3
 27 files changed, 762 insertions(+), 178 deletions(-)


-- 
Roger Leigh
                Printing on GNU/Linux?  http://gutenprint.sourceforge.net/
                Debian GNU/Linux        http://www.debian.org/
                GPG Public Key: 0x25BFB848.  Please sign and encrypt your mail.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: schroot-safecleanup2.patch
Type: text/x-patch
Size: 55162 bytes
Desc: Safe unmount and cleanup patch, take two
Url : http://lists.alioth.debian.org/pipermail/buildd-tools-devel/attachments/20060609/ddcf8221/schroot-safecleanup2-0001.bin