[oe-commits] Alexandre Belloni : wic: fix empty btrfs partitions

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 2624f30dd2d2a8f7fd97117c77a4d6aa2ba6f1f9
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=2624f30dd2d2a8f7fd97117c77a4d6aa2ba6f1f9

Author: Alexandre Belloni <alexandre.belloni at free-electrons.com>
Date:   Tue Feb 10 00:46:41 2015 +0100

wic: fix empty btrfs partitions

btrfs emtpy partition creation is currently not working because of the
usage of the non existant variables rootfs ans extra_imagecmd. It also
as an incorrect size.

Signed-off-by: Alexandre Belloni <alexandre.belloni at free-electrons.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 scripts/lib/wic/kickstart/custom_commands/partition.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/scripts/lib/wic/kickstart/custom_commands/partition.py b/scripts/lib/wic/kickstart/custom_commands/partition.py
index 44df20c..315c612 100644
--- a/scripts/lib/wic/kickstart/custom_commands/partition.py
+++ b/scripts/lib/wic/kickstart/custom_commands/partition.py
@@ -425,12 +425,7 @@ class Wic_PartData(Mic_PartData):
             (fs, self.size)
         exec_cmd(dd_cmd)
 
-        mkfs_cmd = "mkfs.%s -b %d %s" % (self.fstype, self.size, rootfs)
-        (rc, out) = exec_native_cmd(mkfs_cmd, native_sysroot)
-        if rc:
-            msger.error("ERROR: mkfs.%s returned '%s' instead of 0 (which you probably don't want to ignore, use --debug for details)" % (self.fstype, rc))
-
-        mkfs_cmd = "mkfs.%s -F %s %s" % (self.fstype, extra_imagecmd, fs)
+        mkfs_cmd = "mkfs.%s -b %d %s" % (self.fstype, self.size * 1024, fs)
         (rc, out) = exec_native_cmd(mkfs_cmd, native_sysroot)
         if rc:
             msger.error("ERROR: mkfs.%s returned '%s' instead of 0 (which you probably don't want to ignore, use --debug for details)" % (self.fstype, rc))