3
0
forked from pool/findutils

- Really do use /proc/mounts instead of /etc/mtab.

- Add NFSv4 to updatedb's prune list, i.e. make it ignore such 
  file systems.

OBS-URL: https://build.opensuse.org/package/show/Base:System/findutils?expand=0&rev=17
This commit is contained in:
Philipp Thomas 2010-11-17 13:13:39 +00:00 committed by Git OBS Bridge
parent 6dc001ac6c
commit 1acaeb3947
2 changed files with 21 additions and 7 deletions

View File

@ -1,17 +1,25 @@
Index: gnulib/lib/mountlist.c Index: gnulib/lib/mountlist.c
=================================================================== ===================================================================
--- gnulib/lib/mountlist.c.orig 2007-12-02 12:57:51.000000000 +0100 --- gnulib/lib/mountlist.c.orig 2007-12-02 12:57:51.000000000 +0100
+++ gnulib/lib/mountlist.c 2010-04-01 12:20:56.784502964 +0200 +++ gnulib/lib/mountlist.c 2010-11-17 13:08:32.133380836 +0100
@@ -60,7 +60,11 @@ @@ -60,7 +60,7 @@
# include <mntent.h> # include <mntent.h>
# if !defined MOUNTED # if !defined MOUNTED
# if defined _PATH_MOUNTED /* GNU libc */ # if defined _PATH_MOUNTED /* GNU libc */
-# define MOUNTED _PATH_MOUNTED -# define MOUNTED _PATH_MOUNTED
+# if defined __linux__
+# define MOUNTED "/proc/mounts"
+# else
+# define MOUNTED _PATH_MOUNTED +# define MOUNTED _PATH_MOUNTED
+# endif
# endif # endif
# if defined MNT_MNTTAB /* HP-UX. */ # if defined MNT_MNTTAB /* HP-UX. */
# define MOUNTED MNT_MNTTAB # define MOUNTED MNT_MNTTAB
@@ -71,6 +71,11 @@
# endif
#endif
+#if defined __linux__
+# undef MOUNTED
+# define MOUNTED "/proc/mounts"
+#endif
+
#ifdef MOUNTED_GETMNTINFO /* 4.4BSD. */
# include <sys/mount.h>
#endif

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Nov 17 14:11:57 CET 2010 - pth@suse.de
- Really do use /proc/mounts instead of /etc/mtab.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 27 06:30:15 UTC 2010 - lnussel@suse.de Mon Sep 27 06:30:15 UTC 2010 - lnussel@suse.de
@ -8,7 +13,8 @@ Mon Sep 27 06:30:15 UTC 2010 - lnussel@suse.de
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 23 12:36:49 CEST 2010 - pth@suse.de Mon Aug 23 12:36:49 CEST 2010 - pth@suse.de
- Add NFSv4 to updatedb's prune list, i.e. make ignore such file systems. - Add NFSv4 to updatedb's prune list, i.e. make it ignore such
file systems.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 30 18:53:26 CEST 2010 - werner@suse.de Fri Jul 30 18:53:26 CEST 2010 - werner@suse.de