mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-05-18 23:35:34 +00:00
3ab88a7f43
WARNING: webmin-1.850-r0 do_patch:
Some of the context lines in patches were ignored. This can lead to incorrectly applied patches.
The context lines in the patches can be updated with devtool:
devtool modify <recipe>
devtool finish --force-patch-refresh <recipe> <layer_path>
Then the updated patches and the source tree (in devtool's workspace)
should be reviewed to make sure the patches apply in the correct place
and don't introduce duplicate lines (which can, and does happen
when some of the context is ignored). Further information:
http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
Details:
Applying patch nfs-export.patch
patching file exports/save_export.cgi
Hunk #1 succeeded at 50 (offset 10 lines).
Hunk #2 succeeded at 87 with fuzz 2 (offset 17 lines).
Now at patch nfs-export.patch
Signed-off-by: Armin Kuster <akuster808@gmail.com>
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
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!
|