wic: use unique partition number

This is a preparation for 'include' support.

Used unique counter instead of line number for partitions
in .ks file. Line numbers can be equal for different .ks files,
which can cause problems if one .ks file is included into
another.

(From OE-Core rev: cc2233b51f1d22d4e540f4a3e9ceedd7ede9ffa9)

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ed Bartosh authored and Richard Purdie committed 2016-01-20 17:07:13 +00:00
1 parent 43b4058508
commit 8d34eea303
1 file changed
+3 -1
+3 -1
View File
@@ -84,6 +84,7 @@ class KickStart(object):
self.partitions = []
self.bootloader = None
self.lineno = 0
self.partnum = 0
parser = KickStartParser()
subparsers = parser.add_subparsers()
@@ -130,7 +131,8 @@ class KickStart(object):
raise KickStartError('%s:%d: %s' % \
(confpath, lineno, err))
if line.startswith('part'):
self.partitions.append(Partition(parsed, lineno))
self.partnum += 1
self.partitions.append(Partition(parsed, self.partnum))
else:
if not self.bootloader:
self.bootloader = parsed