5073990325
The significant update is that configuration can now be read from a central /etc/nfs.conf file, and it can include other files such as /etc/sysconfig/nfs This means that the old nfs-config.service systemd unit is no longer needed. - /etc/nfs.conf file created to import all sysconfig settings except *_OPTIONS directly into running code. - dropins created to pass *_OPTIONS sysconfig setting to the various daemons. - various specfile improvements, such as using "-D" in "install" commands, and adding "verify_permissions". - "xtab" has not been needed for years and has now been remove. - sysconfig.nfs updated, particular the ServiceRestart declarations have been tuned for systemd units. - 0003-nfs-server-generator-handle-noauto-mounts-correctly.patch Fix the nfs-server-generator so that mounts marked "noauto" are not automatically mounted when NFS exported. (bsc#1019211) - 0001-conffile-ignore-empty-environment-variables.patch 0002-mount-call-setgroups-before-setuid.patch Other minor fixes found during testing. - REMOVED 0001-Make-location-of-nfs-utils_env.sh-configurable.patch now included upstream OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=177
39 lines
1.2 KiB
Diff
39 lines
1.2 KiB
Diff
From 5ec9d9034650ae4372dc1bd44d33a1e8768e3409 Mon Sep 17 00:00:00 2001
|
|
From: NeilBrown <neilb@suse.com>
|
|
Date: Wed, 8 Feb 2017 08:18:34 +1100
|
|
Subject: [PATCH] conffile: ignore empty environment variables.
|
|
|
|
conf_set() already refuses to set an empty value, so if
|
|
foo=
|
|
appear in the config file, it will be ignored.
|
|
This patch extends the policy to environment variables, so empty
|
|
environment variables are treats as though they didn't exist.
|
|
|
|
This means that a separate environment file (e.g. /etc/sysconfig/nfs)
|
|
will be treated the same way whether it is:
|
|
- included in the [environment] section of /etc/nfs.conf
|
|
- sourced by the shell before running code
|
|
- sourced by the systemd EnvironmentFile directive.
|
|
|
|
Signed-off-by: NeilBrown <neilb@suse.com>
|
|
---
|
|
support/nfs/conffile.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/support/nfs/conffile.c b/support/nfs/conffile.c
|
|
index e717c1e39bab..203efd2aa602 100644
|
|
--- a/support/nfs/conffile.c
|
|
+++ b/support/nfs/conffile.c
|
|
@@ -533,7 +533,7 @@ retry:
|
|
* or from environment
|
|
*/
|
|
char *env = getenv(cb->value+1);
|
|
- if (env)
|
|
+ if (env && *env)
|
|
return env;
|
|
section = "environment";
|
|
tag = cb->value + 1;
|
|
--
|
|
2.11.0
|
|
|