remove findutils-4.4.2-autofs.patch no longer needed
/etc/mtab is now symlink to /proc/mounts so it does not make sense to process them separately
This commit is contained in:
parent
99e476cf71
commit
893fbf4cd8
@ -1,100 +0,0 @@
|
|||||||
From 113d6b31623db33fbea65e586f5bfaf1ea1c8d30 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Kamil Dudka <kdudka@redhat.com>
|
|
||||||
Date: Wed, 11 May 2011 16:46:32 +0200
|
|
||||||
Subject: [PATCH 2/4] findutils-4.4.2-autofs.patch
|
|
||||||
|
|
||||||
---
|
|
||||||
find/fstype.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
||||||
1 files changed, 69 insertions(+), 0 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/find/fstype.c b/find/fstype.c
|
|
||||||
index c6dbe8b..9cbf620 100644
|
|
||||||
--- a/find/fstype.c
|
|
||||||
+++ b/find/fstype.c
|
|
||||||
@@ -187,7 +187,72 @@ must_read_fs_list (bool need_fs_type)
|
|
||||||
return entries;
|
|
||||||
}
|
|
||||||
|
|
||||||
+/* Return the device number from MOUNT_OPTIONS, if possible.
|
|
||||||
+ Otherwise return (dev_t) -1. Taken from 'mountlist' module
|
|
||||||
+ from gnulib. */
|
|
||||||
+static dev_t
|
|
||||||
+dev_from_mount_options (char const *mount_options)
|
|
||||||
+{
|
|
||||||
+ /* GNU/Linux allows file system implementations to define their own
|
|
||||||
+ meaning for "dev=" mount options, so don't trust the meaning
|
|
||||||
+ here. */
|
|
||||||
+# ifndef __linux__
|
|
||||||
+
|
|
||||||
+ static char const dev_pattern[] = ",dev=";
|
|
||||||
+ char const *devopt = strstr (mount_options, dev_pattern);
|
|
||||||
+
|
|
||||||
+ if (devopt)
|
|
||||||
+ {
|
|
||||||
+ char const *optval = devopt + sizeof dev_pattern - 1;
|
|
||||||
+ char *optvalend;
|
|
||||||
+ unsigned long int dev;
|
|
||||||
+ errno = 0;
|
|
||||||
+ dev = strtoul (optval, &optvalend, 16);
|
|
||||||
+ if (optval != optvalend
|
|
||||||
+ && (*optvalend == '\0' || *optvalend == ',')
|
|
||||||
+ && ! (dev == ULONG_MAX && errno == ERANGE)
|
|
||||||
+ && dev == (dev_t) dev)
|
|
||||||
+ return dev;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
+# endif
|
|
||||||
+ (void) mount_options;
|
|
||||||
+ return -1;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+/* Return true if the file described by STATP is on autofs file system
|
|
||||||
+ and call set_fstype_devno () if the autofs file system is matched. */
|
|
||||||
+static bool
|
|
||||||
+filesystem_check_autofs (const struct stat *statp)
|
|
||||||
+{
|
|
||||||
+ FILE *fp;
|
|
||||||
+ struct mntent *mnt;
|
|
||||||
+ struct mount_entry entry;
|
|
||||||
+ bool match = false;
|
|
||||||
+
|
|
||||||
+ /* open /proc/mounts because autofs is not listed in /etc/mtab */
|
|
||||||
+ fp = setmntent ("/proc/mounts", "r");
|
|
||||||
+ if (fp == NULL)
|
|
||||||
+ return false;
|
|
||||||
+
|
|
||||||
+ while ((mnt = getmntent (fp)))
|
|
||||||
+ {
|
|
||||||
+ if (0 != strcmp ("autofs", mnt->mnt_type))
|
|
||||||
+ continue;
|
|
||||||
+
|
|
||||||
+ entry.me_mountdir = mnt->mnt_dir;
|
|
||||||
+ entry.me_dev = dev_from_mount_options (mnt->mnt_opts);
|
|
||||||
+ set_fstype_devno (&entry);
|
|
||||||
+ if (entry.me_dev == statp->st_dev)
|
|
||||||
+ {
|
|
||||||
+ match = true;
|
|
||||||
+ break;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ endmntent (fp);
|
|
||||||
+ return match;
|
|
||||||
+}
|
|
||||||
|
|
||||||
/* Return a newly allocated string naming the type of file system that the
|
|
||||||
file PATH, described by STATP, is on.
|
|
||||||
@@ -238,6 +303,10 @@ file_system_type_uncached (const struct stat *statp, const char *path)
|
|
||||||
}
|
|
||||||
free_file_system_list (entries);
|
|
||||||
|
|
||||||
+ /* check for autofs */
|
|
||||||
+ if (type == NULL && filesystem_check_autofs (statp))
|
|
||||||
+ type = xstrdup ("autofs");
|
|
||||||
+
|
|
||||||
/* Don't cache unknown values. */
|
|
||||||
fstype_known = (type != NULL);
|
|
||||||
|
|
||||||
--
|
|
||||||
1.7.4.4
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
|||||||
Summary: The GNU versions of find utilities (find and xargs)
|
Summary: The GNU versions of find utilities (find and xargs)
|
||||||
Name: findutils
|
Name: findutils
|
||||||
Version: 4.5.11
|
Version: 4.5.11
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
License: GPLv3+
|
License: GPLv3+
|
||||||
Group: Applications/File
|
Group: Applications/File
|
||||||
@ -11,10 +11,6 @@ Source0: ftp://alpha.gnu.org/gnu/findutils/%{name}-%{version}.tar.gz
|
|||||||
# do not build locate
|
# do not build locate
|
||||||
Patch1: findutils-4.4.0-no-locate.patch
|
Patch1: findutils-4.4.0-no-locate.patch
|
||||||
|
|
||||||
# learn find to recognize autofs file system by reading /proc/mounts
|
|
||||||
# as autofs mount points are not listed in /etc/mtab
|
|
||||||
Patch2: findutils-4.4.2-autofs.patch
|
|
||||||
|
|
||||||
# add a new option -xautofs to find to not descend into directories on autofs
|
# add a new option -xautofs to find to not descend into directories on autofs
|
||||||
# file systems
|
# file systems
|
||||||
Patch3: findutils-4.4.2-xautofs.patch
|
Patch3: findutils-4.4.2-xautofs.patch
|
||||||
@ -53,7 +49,6 @@ useful for finding things on your system.
|
|||||||
%setup -q
|
%setup -q
|
||||||
rm -rf locate
|
rm -rf locate
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch2 -p1
|
|
||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
%patch4 -p1
|
%patch4 -p1
|
||||||
%patch5 -p1
|
%patch5 -p1
|
||||||
@ -103,6 +98,9 @@ fi
|
|||||||
%{_infodir}/find-maint.info.gz
|
%{_infodir}/find-maint.info.gz
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jul 10 2013 Kamil Dudka <kdudka@redhat.com> - 1:4.5.11-3
|
||||||
|
- remove findutils-4.4.2-autofs.patch no longer needed
|
||||||
|
|
||||||
* Tue Jul 09 2013 Kamil Dudka <kdudka@redhat.com> - 1:4.5.11-2
|
* Tue Jul 09 2013 Kamil Dudka <kdudka@redhat.com> - 1:4.5.11-2
|
||||||
- remove support for obsolete -perm +MODE syntax (#982503)
|
- remove support for obsolete -perm +MODE syntax (#982503)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user