diff options
Diffstat (limited to 'scripts/lib')
| -rw-r--r-- | scripts/lib/wic/kickstart/custom_commands/partition.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/lib/wic/kickstart/custom_commands/partition.py b/scripts/lib/wic/kickstart/custom_commands/partition.py index 72f617a1b6..874b20766d 100644 --- a/scripts/lib/wic/kickstart/custom_commands/partition.py +++ b/scripts/lib/wic/kickstart/custom_commands/partition.py | |||
| @@ -160,7 +160,8 @@ class Wic_PartData(Mic_PartData): | |||
| 160 | self.prepare_swap_partition(cr_workdir, oe_builddir, | 160 | self.prepare_swap_partition(cr_workdir, oe_builddir, |
| 161 | native_sysroot) | 161 | native_sysroot) |
| 162 | elif self.fstype: | 162 | elif self.fstype: |
| 163 | rootfs = "%s/fs_%s.%s" % (cr_workdir, self.label, self.fstype) | 163 | rootfs = "%s/fs_%s.%s.%s" % (cr_workdir, self.label, |
| 164 | self.lineno, self.fstype) | ||
| 164 | if os.path.isfile(rootfs): | 165 | if os.path.isfile(rootfs): |
| 165 | os.remove(rootfs) | 166 | os.remove(rootfs) |
| 166 | for prefix in ("ext", "btrfs", "vfat", "squashfs"): | 167 | for prefix in ("ext", "btrfs", "vfat", "squashfs"): |
| @@ -227,7 +228,8 @@ class Wic_PartData(Mic_PartData): | |||
| 227 | pseudo += "export PSEUDO_NOSYMLINKEXP=%s;" % p_nosymlinkexp | 228 | pseudo += "export PSEUDO_NOSYMLINKEXP=%s;" % p_nosymlinkexp |
| 228 | pseudo += "%s/usr/bin/pseudo " % native_sysroot | 229 | pseudo += "%s/usr/bin/pseudo " % native_sysroot |
| 229 | 230 | ||
| 230 | rootfs = "%s/rootfs_%s.%s" % (cr_workdir, self.label, self.fstype) | 231 | rootfs = "%s/rootfs_%s.%s.%s" % (cr_workdir, self.label, |
| 232 | self.lineno, self.fstype) | ||
| 231 | if os.path.isfile(rootfs): | 233 | if os.path.isfile(rootfs): |
| 232 | os.remove(rootfs) | 234 | os.remove(rootfs) |
| 233 | 235 | ||
