Hello community,
here is the log from the commit of package autofs for openSUSE:Factory checked
in at 2015-02-20 12:00:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/autofs (Old)
and /work/SRC/openSUSE:Factory/.autofs.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "autofs"
Changes:
--------
--- /work/SRC/openSUSE:Factory/autofs/autofs.changes 2015-02-06
10:20:32.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.autofs.new/autofs.changes 2015-02-20
12:00:52.000000000 +0100
@@ -1,0 +2,6 @@
+Tue Feb 17 10:23:44 CET 2015 - mszer...@suse.cz
+
+- add autofs-5.1.0-dont-pass-sloppy-option-for-other-than-nfs-mounts.patch
+ (bsc#911720)
+
+-------------------------------------------------------------------
New:
----
autofs-5.1.0-dont-pass-sloppy-option-for-other-than-nfs-mounts.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ autofs.spec ++++++
--- /var/tmp/diff_new_pack.rCbjtT/_old 2015-02-20 12:00:53.000000000 +0100
+++ /var/tmp/diff_new_pack.rCbjtT/_new 2015-02-20 12:00:53.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package autofs
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -79,6 +79,7 @@
Source100: autofs-rpmlintrc
# PATCH-FIX-UPSTREAM autofs-5.1.0-task-use-after-free.patch [bnc#727392]
Patch82: autofs-5.0.9-task-use-after-free.patch
+Patch83:
autofs-5.1.0-dont-pass-sloppy-option-for-other-than-nfs-mounts.patch
# PATCH-FIX-OPENSUSE autofs-5.0.9-suse-auto_master_default.patch
Patch100: autofs-5.0.9-suse-auto_master_default.patch
# PATCH-EXTEND-OPENSUSE autofs-5.0.8-dbus-udisks-monitor.patch
@@ -106,6 +107,7 @@
cp %{SOURCE5} .
#
%patch82 -p1
+%patch83 -p1
%patch100 -p1
%patch102 -p0 -b .udisks
%patch200 -p1
++++++ autofs-5.1.0-dont-pass-sloppy-option-for-other-than-nfs-mounts.patch
++++++
autofs-5.1.0 - dont pass sloppy option for other than nfs mounts
From: Ian Kent <ik...@redhat.com>
Historically autofs added an option to mounts, called the sloppy
option, meant to allow mount(8) to ignore invalid mount options.
This was done so that mount map entries for sites that needed to
use different mount options for some machines would still work.
It was needed for nfs mounts in particular.
Recent changes to mount(8) cause the sloppy option to be passed on
for all mounts when it is given.
Previously mount(8) only passed on the option to nfs mounts so now,
for other than nfs mounts, the mount will fail if the file system
doesn't understand the sloppy option.
Since the option was not passed on to other than nfs mounts before
it seems sensible for autofs to not add it for other than nfs mounts
now.
Signed-off-by: Ian Kent <ik...@redhat.com>
---
modules/mount_bind.c | 9 ++++-----
modules/mount_changer.c | 6 +++---
modules/mount_ext2.c | 6 +++---
modules/mount_generic.c | 4 ++--
4 files changed, 12 insertions(+), 13 deletions(-)
--- a/modules/mount_bind.c
+++ b/modules/mount_bind.c
@@ -158,13 +158,12 @@ int mount_mount(struct autofs_point *ap,
if (!status)
existed = 0;
- debug(ap->logopt,
- MODPREFIX
- "calling mount --bind " SLOPPY " -o %s %s %s",
+ debug(ap->logopt, MODPREFIX
+ "calling mount --bind -o %s %s %s",
options, what, fullpath);
- err = spawn_bind_mount(ap->logopt,
- SLOPPYOPT "-o", options, what, fullpath, NULL);
+ err = spawn_bind_mount(ap->logopt, "-o",
+ options, what, fullpath, NULL);
if (err) {
if (ap->type != LKP_INDIRECT)
--- a/modules/mount_changer.c
+++ b/modules/mount_changer.c
@@ -103,12 +103,12 @@ int mount_mount(struct autofs_point *ap,
}
if (options && options[0]) {
- debug(ap->logopt,
- MODPREFIX "calling mount -t %s " SLOPPY "-o %s %s %s",
+ debug(ap->logopt, MODPREFIX
+ "calling mount -t %s -o %s %s %s",
fstype, options, what, fullpath);
err = spawn_mount(ap->logopt, "-t", fstype,
- SLOPPYOPT "-o", options, what, fullpath, NULL);
+ "-o", options, what, fullpath, NULL);
} else {
debug(ap->logopt,
MODPREFIX "calling mount -t %s %s %s",
--- a/modules/mount_ext2.c
+++ b/modules/mount_ext2.c
@@ -116,11 +116,11 @@ int mount_mount(struct autofs_point *ap,
}
if (options) {
- debug(ap->logopt,
- MODPREFIX "calling mount -t %s " SLOPPY "-o %s %s %s",
+ debug(ap->logopt, MODPREFIX
+ "calling mount -t %s -o %s %s %s",
fstype, options, what, fullpath);
err = spawn_mount(ap->logopt, "-t", fstype,
- SLOPPYOPT "-o", options, what, fullpath, NULL);
+ "-o", options, what, fullpath, NULL);
} else {
debug(ap->logopt,
MODPREFIX "calling mount -t %s %s %s",
--- a/modules/mount_generic.c
+++ b/modules/mount_generic.c
@@ -97,11 +97,11 @@ int mount_mount(struct autofs_point *ap,
if (options && options[0]) {
debug(ap->logopt,
- MODPREFIX "calling mount -t %s " SLOPPY "-o %s %s %s",
+ MODPREFIX "calling mount -t %s -o %s %s %s",
fstype, options, loc, fullpath);
err = spawn_mount(ap->logopt, "-t", fstype,
- SLOPPYOPT "-o", options, loc, fullpath, NULL);
+ "-o", options, loc, fullpath, NULL);
} else {
debug(ap->logopt, MODPREFIX "calling mount -t %s %s %s",
fstype, loc, fullpath);
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
