From 55f81a38e76023f6eaa7cd9130ef38b0ce74733d Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Thu, 5 Feb 2015 15:08:35 +0100 Subject: [PATCH] 2.26-0.3: upgrade to -rc2 --- 2.26-rc2-remount.patch | 83 ------------------------------------------ util-linux.spec | 10 ++--- 2 files changed, 5 insertions(+), 88 deletions(-) delete mode 100644 2.26-rc2-remount.patch diff --git a/2.26-rc2-remount.patch b/2.26-rc2-remount.patch deleted file mode 100644 index 1bc7d3c..0000000 --- a/2.26-rc2-remount.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 2498303575b85fe0a81dabb3775eb0a60a5f420a Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Fri, 16 Jan 2015 12:24:57 +0100 -Subject: [PATCH] libmount: revert "read mtab on remount" idea - -It's backwardly incompatible nonsense to prefer mtab on remount. - - mount -o remount /foo - -has to read mount options from fstab otherwise the remount has no -effect. (The ideal solution would be to read both mtab, then modify -the options according to fstab -- but for now more important is to be -backwardly compatible.) - -References: https://bugzilla.redhat.com/show_bug.cgi?id=1182778 -Signed-off-by: Karel Zak ---- - libmount/src/context.c | 7 +------ - sys-utils/mount.8 | 17 ++++++++--------- - 2 files changed, 9 insertions(+), 15 deletions(-) - -diff --git a/libmount/src/context.c b/libmount/src/context.c -index 14fa44b..f623f34 100644 ---- a/libmount/src/context.c -+++ b/libmount/src/context.c -@@ -2051,13 +2051,8 @@ int mnt_context_apply_fstab(struct libmnt_context *cxt) - cxt->optsmode &= ~MNT_OMODE_FORCE; - } - -- if (mnt_context_get_mflags(cxt, &mflags) == 0 && mflags & MS_REMOUNT) { -- /* preffer mtab on remount */ -- DBG(CXT, ul_debugobj(cxt, "force mtab parsing on remount")); -- cxt->optsmode |= MNT_OMODE_MTAB; -- cxt->optsmode &= ~MNT_OMODE_FSTAB; -+ if (mnt_context_get_mflags(cxt, &mflags) == 0 && mflags & MS_REMOUNT) - isremount = 1; -- } - - if (cxt->fs) { - src = mnt_fs_get_source(cxt->fs); -diff --git a/sys-utils/mount.8 b/sys-utils/mount.8 -index 854268a..6941216 100644 ---- a/sys-utils/mount.8 -+++ b/sys-utils/mount.8 -@@ -1070,10 +1070,9 @@ Attempt to remount an already-mounted filesystem. This is commonly - used to change the mount flags for a filesystem, especially to make a - readonly filesystem writable. It does not change device or mount point. - --The remount functionality follows the standard way the mount command works with --options, but preferred source for the options is mtab (or /proc/self/mouninfo) --rather than fstab. The mount command only does not read mtab --when both the -+The remount functionality follows the standard way the mount command works -+with options from fstab. This means that the mount command only doesn't -+read fstab (or mtab) when both the - .I device - and - .I dir -@@ -1082,16 +1081,16 @@ are specified. - .B "mount \-o remount,rw /dev/foo /dir" - - After this call all old mount options are replaced and arbitrary stuff from --mtab is ignored, except the loop= option which is internally generated and --maintained by the mount command. -+fstab (or mtab) is ignored, except the loop= option which is internally -+generated and maintained by the mount command. - - .B "mount \-o remount,rw /dir" - --After this call mount reads mtab and merges these options with -+After this call mount reads fstab and merges these options with - the options from the command line (\c - .B \-o\c --). If no mtab (or /proc/self/mountinfo) is available than remount with unspecified --source is allowed. -+). If no mountpoint found in fstab than remount with unspecified source is -+allowed. - .TP - .B ro - Mount the filesystem read-only. --- -1.9.3 - diff --git a/util-linux.spec b/util-linux.spec index e03eb23..14b3167 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -2,12 +2,12 @@ Summary: A collection of basic system utilities Name: util-linux Version: 2.26 -Release: 0.2%{?dist} +Release: 0.3%{?dist} License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain Group: System Environment/Base URL: http://en.wikipedia.org/wiki/Util-linux -%define upstream_version %{version}-rc1 +%define upstream_version %{version}-rc2 ### Macros %define compldir %{_datadir}/bash-completion/completions/ @@ -78,9 +78,6 @@ Requires: libfdisk = %{version}-%{release} # 151635 - makeing /var/log/lastlog Patch0: 2.23-login-lastlog-create.patch -# 1182778 - util-linux 2.26-0.1.fc22 causes ro / and /home on boot -Patch1: 2.26-rc2-remount.patch - %description The util-linux package contains a large variety of low-level system utilities that are necessary for a Linux system to function. Among @@ -881,6 +878,9 @@ exit 0 %{_libdir}/python*/site-packages/libmount/* %changelog +* Thu Feb 5 2015 Karel Zak 2.26-0.3 +- upgrade to 2.26-rc2 + * Fri Jan 16 2015 Karel Zak 2.26-0.2 - fix 1182778 - remount causes ro / and /home on boot