| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 1 | From 7eba4c98c6953fa6ea76c1620d19524bcfa3a576 Mon Sep 17 00:00:00 2001 |
| 2 | From: Kevin Strasser <kevin.strasser@linux.intel.com> |
| 3 | Date: Wed, 1 Aug 2012 11:51:26 -0700 |
| 4 | Subject: [PATCH] nfs export: remove nfsd check |
| 5 | |
| 6 | nfsd runs as a kernel process and does not have a pid. This means |
| 7 | that the command assigned to apply_cmd will never be executed when |
| 8 | the user tries to apply changes to nfs exports. |
| 9 | |
| 10 | Upstream-Status: Inappropriate [config] |
| 11 | |
| 12 | Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com> |
| 13 | --- |
| 14 | exports/exports-lib.pl | 2 +- |
| 15 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 16 | |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame^] | 17 | Index: webmin-1.850/exports/exports-lib.pl |
| 18 | =================================================================== |
| 19 | --- webmin-1.850.orig/exports/exports-lib.pl |
| 20 | +++ webmin-1.850/exports/exports-lib.pl |
| 21 | @@ -301,7 +301,7 @@ return !&has_command("rpc.nfsd") && !&ha |
| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 22 | sub restart_mountd |
| 23 | { |
| 24 | # Try exportfs -r first |
| 25 | -if ($config{'apply_cmd'} && &find_byname("nfsd") && &find_byname("mountd")) { |
| 26 | +if ($config{'apply_cmd'} && &find_byname("mountd")) { |
| 27 | my $out = &backquote_logged("$config{'apply_cmd'} 2>&1 </dev/null"); |
| 28 | if (!$? && $out !~ /invalid|error|failed/i) { |
| 29 | # Looks like it worked! |