summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--scripts/lib/mic/kickstart/custom_commands/partition.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/scripts/lib/mic/kickstart/custom_commands/partition.py b/scripts/lib/mic/kickstart/custom_commands/partition.py
index 91d751eb16..e0a82f58f6 100644
--- a/scripts/lib/mic/kickstart/custom_commands/partition.py
+++ b/scripts/lib/mic/kickstart/custom_commands/partition.py
@@ -174,7 +174,6 @@ class Wic_PartData(Mic_PartData):
174 """ 174 """
175 Prepare content for an ext2/3/4 rootfs partition. 175 Prepare content for an ext2/3/4 rootfs partition.
176 """ 176 """
177 populate_script = "%s/usr/bin/populate-extfs.sh" % native_sysroot
178 177
179 image_rootfs = rootfs_dir 178 image_rootfs = rootfs_dir
180 rootfs = "%s/rootfs.%s" % (cr_workdir, self.fstype) 179 rootfs = "%s/rootfs.%s" % (cr_workdir, self.fstype)
@@ -199,11 +198,10 @@ class Wic_PartData(Mic_PartData):
199 198
200 extra_imagecmd = "-i 8192" 199 extra_imagecmd = "-i 8192"
201 200
202 mkfs_cmd = "mkfs.%s -F %s %s" % (self.fstype, extra_imagecmd, rootfs) 201 mkfs_cmd = "mkfs.%s -F %s %s -d %s" % \
202 (self.fstype, extra_imagecmd, rootfs, image_rootfs)
203 rc, out = exec_native_cmd(mkfs_cmd, native_sysroot) 203 rc, out = exec_native_cmd(mkfs_cmd, native_sysroot)
204 204
205 populate_cmd = populate_script + " " + image_rootfs + " " + rootfs
206 rc, out = exec_native_cmd(pseudo + populate_cmd, native_sysroot)
207 205
208 # get the rootfs size in the right units for kickstart (Mb) 206 # get the rootfs size in the right units for kickstart (Mb)
209 du_cmd = "du -Lbms %s" % rootfs 207 du_cmd = "du -Lbms %s" % rootfs