From: Jim Meyering <meyering@redhat.com>
Date: Mon, 19 Oct 2009 07:11:08 +0000 (+0200)
Subject: tests: rm/one-file-system: work around umount failure
X-Git-Tag: v8.1~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c695781753fdb3eceb78afdd947b86501209b2f2;p=thirdparty%2Fcoreutils.git

tests: rm/one-file-system: work around umount failure

* tests/rm/one-file-system (cleanup_): Unmount a/b, rather than
"$other_partition_tmpdir", to accommodate those who link /etc/mtab
to /proc/mounts.  Reported by Gilles Espinasse in
http://thread.gmane.org/gmane.comp.gnu.coreutils.bugs/18508
---

diff --git a/THANKS b/THANKS
index 29013f6000..5efe2fa1e9 100644
--- a/THANKS
+++ b/THANKS
@@ -210,6 +210,7 @@ Geoff Whale                         geoffw@cse.unsw.EDU.AU
 Gerald Pfeifer                      gerald@pfeifer.com
 Gerhard Poul                        gpoul@gnu.org
 Germano Leichsenring                germano@jedi.cs.kobe-u.ac.jp
+Gilles Espinasse                    g.esp@free.fr
 Glen Lenker                         glen.lenker@gmail.com
 Göran Uddeborg                      goeran@uddeborg.se
 Guochun Shi                         gshi@ncsa.uiuc.edu
diff --git a/tests/rm/one-file-system b/tests/rm/one-file-system
index c8e11eb54c..db00a5b47d 100755
--- a/tests/rm/one-file-system
+++ b/tests/rm/one-file-system
@@ -27,7 +27,10 @@ require_root_
 # If used, these must *follow* test-lib.sh.
 cleanup_()
 {
-  umount "$other_partition_tmpdir"
+  # When you take the undesirable shortcut of making /etc/mtab a link
+  # to /proc/mounts, unmounting "$other_partition_tmpdir" would fail.
+  # So, here we unmount a/b instead.
+  umount a/b
   rm -rf "$other_partition_tmpdir"
 }
 . "$abs_srcdir/other-fs-tmpdir"