diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /net-fs/autofs/files/autofs-5.0.7-sloppy-mount.patch | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'net-fs/autofs/files/autofs-5.0.7-sloppy-mount.patch')
-rw-r--r-- | net-fs/autofs/files/autofs-5.0.7-sloppy-mount.patch | 99 |
1 files changed, 99 insertions, 0 deletions
diff --git a/net-fs/autofs/files/autofs-5.0.7-sloppy-mount.patch b/net-fs/autofs/files/autofs-5.0.7-sloppy-mount.patch new file mode 100644 index 000000000000..86e02bce5558 --- /dev/null +++ b/net-fs/autofs/files/autofs-5.0.7-sloppy-mount.patch @@ -0,0 +1,99 @@ +From: Ian Kent <ikent@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 <ikent@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); + |