summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Belloni <alexandre.belloni@free-electrons.com>2015-02-10 00:46:41 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-14 08:40:59 +0000
commit5c056356bcf9e8c5329de23905acc30ec7665883 (patch)
tree1abdeaa96006e8150bae5cd2bfeb3d7f53906d9e
parent4dce5c44ab1a184247a18df28c34f94b2d332b1e (diff)
downloadpoky-5c056356bcf9e8c5329de23905acc30ec7665883.tar.gz
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. (From OE-Core rev: 2624f30dd2d2a8f7fd97117c77a4d6aa2ba6f1f9) Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--scripts/lib/wic/kickstart/custom_commands/partition.py7
1 files changed, 1 insertions, 6 deletions
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):
425 (fs, self.size) 425 (fs, self.size)
426 exec_cmd(dd_cmd) 426 exec_cmd(dd_cmd)
427 427
428 mkfs_cmd = "mkfs.%s -b %d %s" % (self.fstype, self.size, rootfs) 428 mkfs_cmd = "mkfs.%s -b %d %s" % (self.fstype, self.size * 1024, fs)
429 (rc, out) = exec_native_cmd(mkfs_cmd, native_sysroot)
430 if rc:
431 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))
432
433 mkfs_cmd = "mkfs.%s -F %s %s" % (self.fstype, extra_imagecmd, fs)
434 (rc, out) = exec_native_cmd(mkfs_cmd, native_sysroot) 429 (rc, out) = exec_native_cmd(mkfs_cmd, native_sysroot)
435 if rc: 430 if rc:
436 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)) 431 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))