In order to keep upgrade sucessful,
update the epoth version to 2.
Signed-off-by: Wu Bo <wubo40@huawei.com>
(cherry picked from commit 8a399a13f4624d832402a2d65258d71407238b13)
set use-gss-proxy to true in nfs.conf to be consistent with the
description of 0002-nfs-utils-set-use-gss-proxy-1-to-enable-gss-proxy-by.patch
Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com>
(cherry picked from commit fbc4dea8c023c79eb7c1b6500685adbe5b94ded8)
nfs-idmapd.service would report following error when stopped:
Starting NFSv4 ID-name mapping service...
rpc.idmapd[1198]: Setting log level to 0
Started NFSv4 ID-name mapping service.
rpc.idmapd[1198]: exiting on signal 15
Stopping NFSv4 ID-name mapping service...
nfs-idmapd.service: Main process exited, code=exited, status=1/FAILURE
nfs-idmapd.service: Failed with result 'exit-code'.
Stopped NFSv4 ID-name mapping service.
commit 93e8f092(idmapd: Add graceful exit and resource cleanup)
redirected SIGTERM, so when executing "systemctl stop nfs-idmapd", the
main() of idmapd would running to tail to return, while it returned 1
which considered as error by systemd.
So here just return 0 in main().
In commit 104f90f4ce ('gssd: Introduce use-gss-proxy boolean to nfs.conf'),
use-gss-proxy par in [gssd] section of nfs.conf is introduced to
allow the used of the gssprox-mech. However, the default value
of use-gss-proxy is false, which cause different behavor with older
version.
In order to be consistent with the old versions, here we set
use-gss-proxy to true in nfs.conf.
Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com>
(cherry picked from commit 8d42341c703ce6702bd111d27632d7d21c74b3c6)
