From: Alexandre Belloni Date: Mon, 9 Feb 2015 23:46:41 +0000 (+0100) Subject: wic: fix empty btrfs partitions X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=e0553ba4346413680daf44b2b53e20ca9cc6f688;p=openembedded-core.git 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. Change-Id: I7cb0b669cca8caa061aa292d9d355a3c21767bc9 Signed-off-by: Alexandre Belloni Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Otavio Salvador --- diff --git a/scripts/lib/wic/kickstart/custom_commands/partition.py b/scripts/lib/wic/kickstart/custom_commands/partition.py index 44df20c58a..315c612884 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))