mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-02-18 15:40:27 +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>
40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
commit e48f61d2f6df32a518bcb84db8c6eacfe5435c32
|
|
Author: Yu Ke <ke.yu@intel.com>
|
|
Date: Fri Oct 28 14:40:51 2011 +0800
|
|
|
|
NFS export: fix syntax issue
|
|
|
|
fix two syntax issue in /etc/exports:
|
|
1. if it is exported to everyone, should use "*", e.g. "/export *(xxx)"
|
|
2. explicitly specify subtree_check or no_subtree_check, required by latest nfs-utils
|
|
|
|
Upstream-Status: Pending
|
|
|
|
Signed-off-by: Yu Ke <ke.yu@intel.com>
|
|
|
|
Index: webmin-1.850/exports/save_export.cgi
|
|
===================================================================
|
|
--- webmin-1.850.orig/exports/save_export.cgi
|
|
+++ webmin-1.850/exports/save_export.cgi
|
|
@@ -50,7 +50,7 @@ else {
|
|
&error(&text('save_enetmask', $in{'netmask'}));
|
|
$exp{'host'} = $in{'network'}."/".$in{'netmask'};
|
|
}
|
|
- elsif ($in{'mode'} == 3) { $exp{'host'} = ""; }
|
|
+ elsif ($in{'mode'} == 3) { $exp{'host'} = "*"; }
|
|
else {
|
|
$in{'host'} =~ /\*/ || &to_ipaddress($in{'host'}) ||
|
|
&error(&text('save_ehost', $in{'host'}));
|
|
@@ -87,6 +87,11 @@ else {
|
|
delete($opts{'no_subtree_check'});
|
|
delete($opts{'subtree_check'});
|
|
$opts{'no_subtree_check'} = "" if ($in{'no_subtree_check'});
|
|
+ if ($in{'no_subtree_check'}) {
|
|
+ $opts{'no_subtree_check'} = "";
|
|
+ } else {
|
|
+ $opts{'subtree_check'} = "";
|
|
+ }
|
|
|
|
delete($opts{'nohide'});
|
|
delete($opts{'hide'});
|