diff options
| author | Dave Cobbley <david.j.cobbley@linux.intel.com> | 2018-08-14 20:05:37 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-23 04:26:31 +0300 |
| commit | eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 (patch) | |
| tree | de291a73dc37168da6370e2cf16c347d1eba9df8 /meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/exports-lib.pl.patch | |
| parent | 9c3cf826d853102535ead04cebc2d6023eff3032 (diff) | |
| download | openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.tar.xz | |
[Subtree] Removing import-layers directory
As part of the move to subtrees, need to bring all the import layers
content to the top level.
Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/exports-lib.pl.patch')
| -rw-r--r-- | meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/exports-lib.pl.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/exports-lib.pl.patch b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/exports-lib.pl.patch new file mode 100644 index 0000000000..d5dfed5ad4 --- /dev/null +++ b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/exports-lib.pl.patch @@ -0,0 +1,29 @@ +From 7eba4c98c6953fa6ea76c1620d19524bcfa3a576 Mon Sep 17 00:00:00 2001 +From: Kevin Strasser <kevin.strasser@linux.intel.com> +Date: Wed, 1 Aug 2012 11:51:26 -0700 +Subject: [PATCH] nfs export: remove nfsd check + +nfsd runs as a kernel process and does not have a pid. This means +that the command assigned to apply_cmd will never be executed when +the user tries to apply changes to nfs exports. + +Upstream-Status: Inappropriate [config] + +Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com> +--- + exports/exports-lib.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: webmin-1.850/exports/exports-lib.pl +=================================================================== +--- webmin-1.850.orig/exports/exports-lib.pl ++++ webmin-1.850/exports/exports-lib.pl +@@ -301,7 +301,7 @@ return !&has_command("rpc.nfsd") && !&ha + sub restart_mountd + { + # Try exportfs -r first +-if ($config{'apply_cmd'} && &find_byname("nfsd") && &find_byname("mountd")) { ++if ($config{'apply_cmd'} && &find_byname("mountd")) { + my $out = &backquote_logged("$config{'apply_cmd'} 2>&1 </dev/null"); + if (!$? && $out !~ /invalid|error|failed/i) { + # Looks like it worked! |