forked from pool/util-linux
Updating link to change in openSUSE:Factory/util-linux revision 91.0
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=b7de1ab142cd13817916d75d37885f54
This commit is contained in:
parent
1c05fa1ec4
commit
9c4ef89952
41
util-linux-mount-detect-ro-mount.patch
Normal file
41
util-linux-mount-detect-ro-mount.patch
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
From 81694f8c60dffb7851f941e69a1b79bc573ace53 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Petr Uzel <petr.uzel@suse.cz>
|
||||||
|
Date: Fri, 21 May 2010 15:19:31 +0200
|
||||||
|
Subject: [PATCH] mount: detect when kernel silently adds MS_RDONLY flag
|
||||||
|
|
||||||
|
Linux kernel can silently add MS_RDONLY flag when mounting file system that
|
||||||
|
does not have write support. Check this to avoid 'ro' in /proc/mounts and 'rw'
|
||||||
|
in mtab.
|
||||||
|
|
||||||
|
[kzak@redhat.com: - don't check for 'ro' for MS_MOVE and MS_PROPAGATION]
|
||||||
|
|
||||||
|
Reported-by: James Foris <jim.foris@med.ge.com>
|
||||||
|
Signed-off-by: Petr Uzel <petr.uzel@suse.cz>
|
||||||
|
Signed-off-by: Karel Zak <kzak@redhat.com>
|
||||||
|
---
|
||||||
|
mount/mount.c | 12 ++++++++++++
|
||||||
|
1 files changed, 12 insertions(+), 0 deletions(-)
|
||||||
|
|
||||||
|
Index: util-linux-ng-2.17.2/mount/mount.c
|
||||||
|
===================================================================
|
||||||
|
--- util-linux-ng-2.17.2.orig/mount/mount.c 2010-05-28 15:22:47.000000000 +0200
|
||||||
|
+++ util-linux-ng-2.17.2/mount/mount.c 2010-05-28 15:23:03.000000000 +0200
|
||||||
|
@@ -1388,6 +1388,18 @@ mount_retry:
|
||||||
|
flags &= ~MS_RDONLY;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ /* Kernel can silently add MS_RDONLY flag when mounting file system that
|
||||||
|
+ * does not have write support. Check this to avoid 'ro' in /proc/mounts
|
||||||
|
+ * and 'rw' in mtab.
|
||||||
|
+ */
|
||||||
|
+ if (!fake && mnt5_res == 0 &&
|
||||||
|
+ !(flags & MS_RDONLY) && !(flags & MS_PROPAGATION) && !(flags & MS_MOVE) &&
|
||||||
|
+ is_readonly(node)) {
|
||||||
|
+
|
||||||
|
+ printf(_("mount: warning: %s seems to be mounted read-only.\n"), node);
|
||||||
|
+ flags |= MS_RDONLY;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
if (fake || mnt5_res == 0) {
|
||||||
|
/* Mount succeeded, report this (if verbose) and write mtab entry. */
|
||||||
|
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri May 28 13:24:43 UTC 2010 - puzel@novell.com
|
||||||
|
|
||||||
|
- add util-linux-mount-detect-ro-mount.patch (bnc#481123)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue May 11 13:58:49 UTC 2010 - puzel@novell.com
|
Tue May 11 13:58:49 UTC 2010 - puzel@novell.com
|
||||||
|
|
||||||
|
@ -27,7 +27,7 @@ License: GPLv2+
|
|||||||
Group: System/Base
|
Group: System/Base
|
||||||
AutoReqProv: on
|
AutoReqProv: on
|
||||||
Version: 2.17.2
|
Version: 2.17.2
|
||||||
Release: 2
|
Release: 3
|
||||||
Recommends: %name-lang = %{version}
|
Recommends: %name-lang = %{version}
|
||||||
Summary: A collection of basic system utilities
|
Summary: A collection of basic system utilities
|
||||||
Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v%{version}/%name-ng-%{version}.tar.bz2
|
Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v%{version}/%name-ng-%{version}.tar.bz2
|
||||||
@ -73,6 +73,8 @@ Patch3: util-linux-2.17.1-mount_losetup_crypto.patch
|
|||||||
Patch4: util-linux-2.17.1-losetup-honor-documented-c-option
|
Patch4: util-linux-2.17.1-losetup-honor-documented-c-option
|
||||||
# 603328
|
# 603328
|
||||||
Patch5: util-linux-addpart-use-atoll.patch
|
Patch5: util-linux-addpart-use-atoll.patch
|
||||||
|
# bnc#481123
|
||||||
|
Patch6: util-linux-mount-detect-ro-mount.patch
|
||||||
##
|
##
|
||||||
## adjtimex
|
## adjtimex
|
||||||
##
|
##
|
||||||
@ -162,6 +164,7 @@ unique IDs (UUIDs).
|
|||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
%patch4 -p1
|
%patch4 -p1
|
||||||
%patch5 -p1
|
%patch5 -p1
|
||||||
|
%patch6 -p1
|
||||||
#
|
#
|
||||||
cd adjtimex-*
|
cd adjtimex-*
|
||||||
%patch50 -p1
|
%patch50 -p1
|
||||||
|
Loading…
Reference in New Issue
Block a user