aboutsummaryrefslogtreecommitdiff
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:35 +0000
commit2624f30dd2d2a8f7fd97117c77a4d6aa2ba6f1f9 (patch)
tree3e39293929c5b09cc21dafe37b8c934bdec6cbc1
parent0a6668f6e60b4195ff4163c00fc972bacdb27b4b (diff)
downloadopenembedded-core-2624f30dd2d2a8f7fd97117c77a4d6aa2ba6f1f9.zip
openembedded-core-2624f30dd2d2a8f7fd97117c77a4d6aa2ba6f1f9.tar.gz
openembedded-core-2624f30dd2d2a8f7fd97117c77a4d6aa2ba6f1f9.tar.bz2
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@free-electrons.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-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 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))