aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-extended/webmin
diff options
context:
space:
mode:
authorYu Ke <ke.yu@intel.com>2011-10-28 15:11:26 +0800
committerPaul Eggleton <paul.eggleton@linux.intel.com>2011-11-08 11:47:18 +0000
commit3cbb21f04334cc26d5ab1579482d73578a540645 (patch)
tree8b7a3d083a05e558473ec400b464f3210abb8d1f /recipes-extended/webmin
parent55de74247256e0281aacab8937ca03d476dd10cf (diff)
downloadmeta-baryon-3cbb21f04334cc26d5ab1579482d73578a540645.tar.gz
meta-baryon-3cbb21f04334cc26d5ab1579482d73578a540645.tar.bz2
meta-baryon-3cbb21f04334cc26d5ab1579482d73578a540645.zip
webmin: fix the NFS export syntax issue
Signed-off-by: Yu Ke <ke.yu@intel.com>
Diffstat (limited to 'recipes-extended/webmin')
-rw-r--r--recipes-extended/webmin/files/nfs-export.patch39
-rw-r--r--recipes-extended/webmin/webmin_1.570.bb3
2 files changed, 41 insertions, 1 deletions
diff --git a/recipes-extended/webmin/files/nfs-export.patch b/recipes-extended/webmin/files/nfs-export.patch
new file mode 100644
index 0000000..c17e3b2
--- /dev/null
+++ b/recipes-extended/webmin/files/nfs-export.patch
@@ -0,0 +1,39 @@
+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>
+
+diff --git a/exports/save_export.cgi b/exports/save_export.cgi
+index 3bc2f97..3e60298 100755
+--- a/exports/save_export.cgi
++++ b/exports/save_export.cgi
+@@ -40,7 +40,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'}));
+@@ -70,6 +70,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'});
+ $opts{'nohide'} = "" if ($in{'nohide'});
diff --git a/recipes-extended/webmin/webmin_1.570.bb b/recipes-extended/webmin/webmin_1.570.bb
index 8319bd5..276db7f 100644
--- a/recipes-extended/webmin/webmin_1.570.bb
+++ b/recipes-extended/webmin/webmin_1.570.bb
@@ -9,7 +9,7 @@ RDEPENDS_${PN} += "perl-module-warnings perl-module-warnings-register perl-modul
RDEPENDS_${PN} += "perl-module-fcntl perl-module-tie-hash perl-module-vars perl-module-time-local perl-module-config perl-module-constant"
RDEPENDS_${PN} += "perl-module-file perl-module-file-glob perl-module-sdbm perl-module-sdbm-file perl-module-timelocal"
-PR = "r4"
+PR = "r5"
SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \
file://setup.sh \
@@ -18,6 +18,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \
file://fdisk-partprobe-fix.patch \
file://remove-startup-option.patch \
file://disable-version-check.patch \
+ file://nfs-export.patch \
file://mount-excludefs.patch"
inherit allarch perlnative update-rc.d