aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-extended/webmin
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-10-23 15:55:30 +0100
committerPaul Eggleton <paul.eggleton@linux.intel.com>2011-10-23 16:13:53 +0100
commit9671ab0a1cd71134559e1ead7fbe2f975ba8e3b4 (patch)
tree501a6aa4ca0bc5096dacf5c64e87c169b29793da /recipes-extended/webmin
parent9acfb8a4c3527f542d16ea4f7d9b32f985029c2d (diff)
downloadmeta-baryon-9671ab0a1cd71134559e1ead7fbe2f975ba8e3b4.tar.gz
meta-baryon-9671ab0a1cd71134559e1ead7fbe2f975ba8e3b4.tar.bz2
meta-baryon-9671ab0a1cd71134559e1ead7fbe2f975ba8e3b4.zip
webmin: fix prepending partprobe command line in fdisk module
If the partprobe command is available (part of GNU parted) then the fdisk module prepends this command to any formatting command, however it was also appending the prepended command to itself resulting in an invalid command. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'recipes-extended/webmin')
-rw-r--r--recipes-extended/webmin/files/fdisk-partprobe-fix.patch16
-rw-r--r--recipes-extended/webmin/webmin_1.570.bb5
2 files changed, 19 insertions, 2 deletions
diff --git a/recipes-extended/webmin/files/fdisk-partprobe-fix.patch b/recipes-extended/webmin/files/fdisk-partprobe-fix.patch
new file mode 100644
index 0000000..2279c96
--- /dev/null
+++ b/recipes-extended/webmin/files/fdisk-partprobe-fix.patch
@@ -0,0 +1,16 @@
+# Fix prepending partprobe command in fdisk module library code
+#
+# Upstream-status: Pending
+#
+# Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
+--- webmin-1.570.orig/fdisk/fdisk-lib.pl
++++ webmin-1.570/fdisk/fdisk-lib.pl
+@@ -940,7 +940,7 @@ elsif ($_[0] eq "fatx") {
+ $cmd = "mkfs -t $_[0] $_[1]";
+ }
+ if (&has_command("partprobe")) {
+- $cmd .= "partprobe ; $cmd";
++ $cmd = "partprobe ; $cmd";
+ }
+ return $cmd;
+ }
diff --git a/recipes-extended/webmin/webmin_1.570.bb b/recipes-extended/webmin/webmin_1.570.bb
index f0f9bed..deeda9d 100644
--- a/recipes-extended/webmin/webmin_1.570.bb
+++ b/recipes-extended/webmin/webmin_1.570.bb
@@ -9,12 +9,13 @@ 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"
-PR = "r1"
+PR = "r2"
SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \
file://setup.sh \
file://init-exclude.patch \
- file://net-generic.patch"
+ file://net-generic.patch \
+ file://fdisk-partprobe-fix.patch"
inherit allarch perlnative update-rc.d