summaryrefslogtreecommitdiffstats
path: root/mount
diff options
context:
space:
mode:
authorKarel Zak2006-12-07 00:27:03 +0100
committerKarel Zak2006-12-07 00:27:03 +0100
commit9cb689775c56f308cd2128747b3bb6d5a37be213 (patch)
treed6a22fb6aac0284987f3c6900b8b8df3c205101d /mount
parentImported from util-linux-2.13-pre2 tarball. (diff)
downloadkernel-qcow2-util-linux-9cb689775c56f308cd2128747b3bb6d5a37be213.tar.gz
kernel-qcow2-util-linux-9cb689775c56f308cd2128747b3bb6d5a37be213.tar.xz
kernel-qcow2-util-linux-9cb689775c56f308cd2128747b3bb6d5a37be213.zip
Imported from util-linux-2.13-pre3 tarball.
Diffstat (limited to 'mount')
-rw-r--r--mount/Makefile.in4
-rw-r--r--mount/README.mount4
-rw-r--r--mount/umount.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/mount/Makefile.in b/mount/Makefile.in
index e448e630d..4bd27d091 100644
--- a/mount/Makefile.in
+++ b/mount/Makefile.in
@@ -117,6 +117,8 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BUILD_AGETTY_FALSE = @BUILD_AGETTY_FALSE@
BUILD_AGETTY_TRUE = @BUILD_AGETTY_TRUE@
+BUILD_CRAMFS_FALSE = @BUILD_CRAMFS_FALSE@
+BUILD_CRAMFS_TRUE = @BUILD_CRAMFS_TRUE@
BUILD_ELVTUNE_FALSE = @BUILD_ELVTUNE_FALSE@
BUILD_ELVTUNE_TRUE = @BUILD_ELVTUNE_TRUE@
BUILD_INIT_FALSE = @BUILD_INIT_FALSE@
@@ -177,8 +179,6 @@ HAVE_TERMCAP_FALSE = @HAVE_TERMCAP_FALSE@
HAVE_TERMCAP_TRUE = @HAVE_TERMCAP_TRUE@
HAVE_UUID_FALSE = @HAVE_UUID_FALSE@
HAVE_UUID_TRUE = @HAVE_UUID_TRUE@
-HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@
-HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
diff --git a/mount/README.mount b/mount/README.mount
index f010a1bd8..3c256415c 100644
--- a/mount/README.mount
+++ b/mount/README.mount
@@ -4,7 +4,7 @@ Doug Quale <quale@saavik.cs.wisc.edu>,
H.J. Lu <hlu@eecs.wsu.edu>,
Rick Sladkey <jrs@world.std.com>,
Stephen Tweedie <sct@dcs.ed.ac.uk>.
+Andries Brouwer <aeb@cwi.nl>
-Presently maintained by Andries Brouwer <aeb@cwi.nl>.
-Ftp site: ftp.win.tue.nl:/pub/linux/utils/util-linux
+Presently maintained by Adrian Bunk <bunk@stusta.de>.
diff --git a/mount/umount.c b/mount/umount.c
index 0eab348fb..80030c9e3 100644
--- a/mount/umount.c
+++ b/mount/umount.c
@@ -707,7 +707,7 @@ main (int argc, char *argv[]) {
if (getuid () != geteuid ()) {
suid = 1;
- if (all || types || nomtab || force)
+ if (all || types || nomtab || force || remount)
die (2, _("umount: only root can do that"));
}