[wic][PATCH 3/9] wic: use new kickstart parser

Ed Bartosh
2016-01-14T14:14:11Z

Used KickStart parser class instead of pykickstart API.

This commit breaks wic as data structures and field names
provided by new API are a bit different from old ones.
This issue will be addressed in the following commits.

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
scripts/lib/wic/conf.py | 4 ++--
scripts/lib/wic/imager/direct.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/lib/wic/conf.py b/scripts/lib/wic/conf.py
index 1d4363a..2e29451 100644
--- a/scripts/lib/wic/conf.py
+++ b/scripts/lib/wic/conf.py
@@ -17,8 +17,8 @@

import os

+from wic.kickstart import KickStart
from wic import msger
-from wic import kickstart
from wic.utils import misc

@@ -87,7 +87,7 @@ class ConfigMgr(object):
if not ksconf:
return

- ksobj = kickstart.read_kickstart(ksconf)
+ ksobj = KickStart(ksconf)

self.create['ks'] = ksobj
self.create['name'] = os.path.splitext(os.path.basename(ksconf))[0]
diff --git a/scripts/lib/wic/imager/direct.py b/scripts/lib/wic/imager/direct.py
index d5603fa..f89c42c 100644
--- a/scripts/lib/wic/imager/direct.py
+++ b/scripts/lib/wic/imager/direct.py
@@ -27,7 +27,7 @@
import os
import shutil

-from wic import kickstart, msger
+from wic import msger
from wic.utils import fs_related
from wic.utils.oe.misc import get_bitbake_var
from wic.utils.partitionedfs import Image
--
2.1.4