| 1 |
vapier 11/09/01 15:19:35 |
| 2 |
|
| 3 |
Added: nfs-utils-1.2.4-exportfs-xlog.patch |
| 4 |
nfs-utils-1.2.4-exportfs-skip-dir.patch |
| 5 |
Log: |
| 6 |
Version bump #373651 by teidakankan. |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 net-fs/nfs-utils/files/nfs-utils-1.2.4-exportfs-xlog.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/files/nfs-utils-1.2.4-exportfs-xlog.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/files/nfs-utils-1.2.4-exportfs-xlog.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: nfs-utils-1.2.4-exportfs-xlog.patch |
| 17 |
=================================================================== |
| 18 |
From aacec6914549f5bf4f5fb2aed0925a8a7e57b50c Mon Sep 17 00:00:00 2001 |
| 19 |
From: Mike Frysinger <vapier@g.o> |
| 20 |
Date: Thu, 1 Sep 2011 11:00:39 -0400 |
| 21 |
Subject: [PATCH] exportfs: drop extra newline in xlog |
| 22 |
|
| 23 |
Since xlog() itself appends a newline, we don't want to add our own |
| 24 |
otherwise we get extra in the output. |
| 25 |
|
| 26 |
Signed-off-by: Mike Frysinger <vapier@g.o> |
| 27 |
--- |
| 28 |
utils/exportfs/exportfs.c | 8 ++++---- |
| 29 |
1 files changed, 4 insertions(+), 4 deletions(-) |
| 30 |
|
| 31 |
diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c |
| 32 |
index 12e8bf1..986a272 100644 |
| 33 |
--- a/utils/exportfs/exportfs.c |
| 34 |
+++ b/utils/exportfs/exportfs.c |
| 35 |
@@ -401,7 +401,7 @@ validate_export(nfs_export *exp) |
| 36 |
int fs_has_fsid = 0; |
| 37 |
|
| 38 |
if (stat(path, &stb) < 0) { |
| 39 |
- xlog(L_ERROR, "Failed to stat %s: %m \n", path); |
| 40 |
+ xlog(L_ERROR, "Failed to stat %s: %m", path); |
| 41 |
return; |
| 42 |
} |
| 43 |
if (!S_ISDIR(stb.st_mode) && !S_ISREG(stb.st_mode)) { |
| 44 |
@@ -530,7 +530,7 @@ export_d_read(const char *dname) |
| 45 |
|
| 46 |
n = scandir(dname, &namelist, NULL, versionsort); |
| 47 |
if (n < 0) |
| 48 |
- xlog(L_NOTICE, "scandir %s: %s\n", dname, strerror(errno)); |
| 49 |
+ xlog(L_NOTICE, "scandir %s: %s", dname, strerror(errno)); |
| 50 |
else if (n == 0) |
| 51 |
return; |
| 52 |
|
| 53 |
@@ -558,7 +558,7 @@ export_d_read(const char *dname) |
| 54 |
|
| 55 |
fname_len = snprintf(fname, PATH_MAX +1, "%s/%s", dname, d->d_name); |
| 56 |
if (fname_len > PATH_MAX) { |
| 57 |
- xlog(L_WARNING, "Too long file name: %s in %s\n", d->d_name, dname); |
| 58 |
+ xlog(L_WARNING, "Too long file name: %s in %s", d->d_name, dname); |
| 59 |
continue; |
| 60 |
} |
| 61 |
|
| 62 |
@@ -672,7 +672,7 @@ dump(int verbose) |
| 63 |
static void |
| 64 |
error(nfs_export *exp, int err) |
| 65 |
{ |
| 66 |
- xlog(L_ERROR, "%s:%s: %s\n", exp->m_client->m_hostname, |
| 67 |
+ xlog(L_ERROR, "%s:%s: %s", exp->m_client->m_hostname, |
| 68 |
exp->m_export.e_path, strerror(err)); |
| 69 |
} |
| 70 |
|
| 71 |
-- |
| 72 |
1.7.6 |
| 73 |
|
| 74 |
|
| 75 |
|
| 76 |
|
| 77 |
1.1 net-fs/nfs-utils/files/nfs-utils-1.2.4-exportfs-skip-dir.patch |
| 78 |
|
| 79 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/files/nfs-utils-1.2.4-exportfs-skip-dir.patch?rev=1.1&view=markup |
| 80 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/files/nfs-utils-1.2.4-exportfs-skip-dir.patch?rev=1.1&content-type=text/plain |
| 81 |
|
| 82 |
Index: nfs-utils-1.2.4-exportfs-skip-dir.patch |
| 83 |
=================================================================== |
| 84 |
From 5dc4c89b6935fcfe327b77681362319e6fd407e0 Mon Sep 17 00:00:00 2001 |
| 85 |
From: Mike Frysinger <vapier@g.o> |
| 86 |
Date: Thu, 1 Sep 2011 11:08:04 -0400 |
| 87 |
Subject: [PATCH] exportfs: do not warn if /etc/exports.d/ does not exist |
| 88 |
|
| 89 |
It isn't uncommon for /etc/exports.d/ to not exist, and imo, it's not |
| 90 |
that big of a deal as often times, a simple /etc/exports is sufficient. |
| 91 |
So silently skip the case where the dir is missing. |
| 92 |
|
| 93 |
Signed-off-by: Mike Frysinger <vapier@g.o> |
| 94 |
--- |
| 95 |
utils/exportfs/exportfs.c | 7 +++++-- |
| 96 |
1 files changed, 5 insertions(+), 2 deletions(-) |
| 97 |
|
| 98 |
diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c |
| 99 |
index 986a272..7432a65 100644 |
| 100 |
--- a/utils/exportfs/exportfs.c |
| 101 |
+++ b/utils/exportfs/exportfs.c |
| 102 |
@@ -529,9 +529,12 @@ export_d_read(const char *dname) |
| 103 |
|
| 104 |
|
| 105 |
n = scandir(dname, &namelist, NULL, versionsort); |
| 106 |
- if (n < 0) |
| 107 |
+ if (n < 0) { |
| 108 |
+ if (errno == ENOENT) |
| 109 |
+ /* Silently return */ |
| 110 |
+ return; |
| 111 |
xlog(L_NOTICE, "scandir %s: %s", dname, strerror(errno)); |
| 112 |
- else if (n == 0) |
| 113 |
+ } else if (n == 0) |
| 114 |
return; |
| 115 |
|
| 116 |
for (i = 0; i < n; i++) { |
| 117 |
-- |
| 118 |
1.7.6 |
Archives