testing/util-linux
SHA256
3
0
Fork 0
forked from pool/util-linux
Code Pull Requests Activity

Accepting request 40798 from Base:System

Browse Source 
Copy from Base:System/util-linux based on submit request 40798 from user puzel

OBS-URL: https://build.opensuse.org/request/show/40798
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/util-linux?expand=0&rev=91
This commit is contained in:
OBS User autobuild 2010-05-28 14:54:13 +00:00 committed by Git OBS Bridge
commit 0b7908afed
3 changed files with 50 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
util-linux-mount-detect-ro-mount.patch Normal file
View 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. */

5
util-linux.changes
View File

@ -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

5
util-linux.spec
View File

@ -27,7 +27,7 @@ License: GPLv2+
Group: System/Base
AutoReqProv: on
Version: 2.17.2
Release: 2
Release: 3
Recommends: %name-lang = %{version}
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
@ -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
# 603328
Patch5: util-linux-addpart-use-atoll.patch
# bnc#481123
Patch6: util-linux-mount-detect-ro-mount.patch
##
## adjtimex
##
@ -162,6 +164,7 @@ unique IDs (UUIDs).
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
#
cd adjtimex-*
%patch50 -p1