dalsi ZS patche

make.sh

@@ -39,9 +39,12 @@ zs1-n-option-impl
 zs2-idmap-init
 zs3-keyctl-order
 zs4-nfs4mount-strtok
-zs5-multhr-hostcache" >> debian/patches/series
+zs5-multhr-hostcache
+zs5-add-missing-params.patch
+zs6-krb-rc-param.patch
+zs9-idmap-verbosity.patch" >> debian/patches/series
 
-dch --newversion "1:1.3.4-6+zs8" "Apply local patches"
+dch --newversion "1:1.3.4-6+zs9" "Apply local patches"
 
 mk-build-deps --install --tool='apt-get -o Debug::pkgProblemResolver=yes --yes' debian/control
 

zs5-add-missing-params.patch

+Index: nfs-utils-1.3.4/debian/nfs-utils_env.sh
+===================================================================
+--- nfs-utils-1.3.4.orig/debian/nfs-utils_env.sh
++++ nfs-utils-1.3.4/debian/nfs-utils_env.sh
+@@ -25,7 +25,7 @@ echo SVCGSSDARGS=\"$RPCSVCGSSDOPTS\"
+ } > /run/sysconfig/nfs-utils
+ 
+ # the following are supported by the systemd units, but not exposed in default files
+-# echo SMNOTIFYARGS=\"$SMNOTIFYARGS\"
+-# echo RPCIDMAPDARGS=\"$RPCIDMAPDARGS\"
+-# echo BLKMAPDARGS=\"$BLKMAPDARGS\"
++echo SMNOTIFYARGS=\"$SMNOTIFYARGS\"
++echo RPCIDMAPDARGS=\"$RPCIDMAPDARGS\"
++echo BLKMAPDARGS=\"$BLKMAPDARGS\"
+ # echo GSS_USE_PROXY=\"$GSS_USE_PROXY\"

zs6-krb-rc-param.patch

+Index: nfs-utils-1.3.4/debian/nfs-utils_env.sh
+===================================================================
+--- nfs-utils-1.3.4.orig/debian/nfs-utils_env.sh
++++ nfs-utils-1.3.4/debian/nfs-utils_env.sh
+@@ -29,3 +29,4 @@ echo SMNOTIFYARGS=\"$SMNOTIFYARGS\"
+ echo RPCIDMAPDARGS=\"$RPCIDMAPDARGS\"
+ echo BLKMAPDARGS=\"$BLKMAPDARGS\"
+ # echo GSS_USE_PROXY=\"$GSS_USE_PROXY\"
++echo KRB5RCACHEDIR=\"$KRB5RCACHEDIR\"

zs9-idmap-verbosity.patch

+Index: nfs-utils-1.3.4/utils/nfsidmap/nfsidmap.c
+===================================================================
+--- nfs-utils-1.3.4.orig/utils/nfsidmap/nfsidmap.c
++++ nfs-utils-1.3.4/utils/nfsidmap/nfsidmap.c
+@@ -418,13 +418,15 @@ int main(int argc, char **argv)
+ 		return EXIT_FAILURE;
+ 	}
+ 
++	if (!verbose)
++		verbose = conf_get_num("General", "Verbosity", 0);
++	if (verbose)
++		nfs4_set_debug(verbose, NULL);
++
+ 	if ((rc = nfs4_init_name_mapping(PATH_IDMAPDCONF)))  {
+ 		xlog_errno(rc, "Unable to create name to user id mappings.");
+ 		return EXIT_FAILURE;
+ 	}
+-	if (!verbose)
+-		verbose = conf_get_num("General", "Verbosity", 0);
+-
+ 	if (display)
+ 		return display_default_domain();
+ 	if (list)
+@@ -444,9 +446,6 @@ int main(int argc, char **argv)
+ 		return EXIT_FAILURE;
+ 	}
+ 
+-	if (verbose)
+-		nfs4_set_debug(verbose, NULL);
+-
+ 	key = strtol(argv[optind++], NULL, 10);
+ 
+ 	arg = strdup(argv[optind]);