1*4882a593SmuzhiyunFrom 7eba4c98c6953fa6ea76c1620d19524bcfa3a576 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Kevin Strasser <kevin.strasser@linux.intel.com> 3*4882a593SmuzhiyunDate: Wed, 1 Aug 2012 11:51:26 -0700 4*4882a593SmuzhiyunSubject: [PATCH] nfs export: remove nfsd check 5*4882a593Smuzhiyun 6*4882a593Smuzhiyunnfsd runs as a kernel process and does not have a pid. This means 7*4882a593Smuzhiyunthat the command assigned to apply_cmd will never be executed when 8*4882a593Smuzhiyunthe user tries to apply changes to nfs exports. 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunUpstream-Status: Inappropriate [config] 11*4882a593Smuzhiyun 12*4882a593SmuzhiyunSigned-off-by: Kevin Strasser <kevin.strasser@linux.intel.com> 13*4882a593Smuzhiyun--- 14*4882a593Smuzhiyun exports/exports-lib.pl | 2 +- 15*4882a593Smuzhiyun 1 file changed, 1 insertion(+), 1 deletion(-) 16*4882a593Smuzhiyun 17*4882a593SmuzhiyunIndex: webmin-1.850/exports/exports-lib.pl 18*4882a593Smuzhiyun=================================================================== 19*4882a593Smuzhiyun--- webmin-1.850.orig/exports/exports-lib.pl 20*4882a593Smuzhiyun+++ webmin-1.850/exports/exports-lib.pl 21*4882a593Smuzhiyun@@ -301,7 +301,7 @@ return !&has_command("rpc.nfsd") && !&ha 22*4882a593Smuzhiyun sub restart_mountd 23*4882a593Smuzhiyun { 24*4882a593Smuzhiyun # Try exportfs -r first 25*4882a593Smuzhiyun-if ($config{'apply_cmd'} && &find_byname("nfsd") && &find_byname("mountd")) { 26*4882a593Smuzhiyun+if ($config{'apply_cmd'} && &find_byname("mountd")) { 27*4882a593Smuzhiyun my $out = &backquote_logged("$config{'apply_cmd'} 2>&1 </dev/null"); 28*4882a593Smuzhiyun if (!$? && $out !~ /invalid|error|failed/i) { 29*4882a593Smuzhiyun # Looks like it worked! 30