remove moblin stuff from mic code

Signed-off-by: Gui Chen <gui.chen@intel.com>

diff --git a/mic/kickstart/__init__.py b/mic/kickstart/__init__.py
index 380b397..8a11c69 100644 (file)
--- a/mic/kickstart/__init__.py
+++ b/mic/kickstart/__init__.py
@@ -34,7 +34,7 @@ from pykickstart.handlers.control import commandMap
 from pykickstart.handlers.control import dataMap
 
 import custom_commands.desktop as desktop
-import custom_commands.moblinrepo as moblinrepo
+import custom_commands.micrepo as micrepo
 import custom_commands.micboot as micboot
 import custom_commands.partition as partition
 
@@ -98,13 +98,13 @@ def read_kickstart(path):
     #ks = ksparser.KickstartParser(version)
 
     using_version = ksversion.DEVEL
-    commandMap[using_version]["desktop"] = desktop.Moblin_Desktop
-    commandMap[using_version]["repo"] = moblinrepo.Moblin_Repo
-    commandMap[using_version]["bootloader"] = micboot.Moblin_Bootloader
-    commandMap[using_version]["part"] = partition.MeeGo_Partition
-    commandMap[using_version]["partition"] = partition.MeeGo_Partition
-    dataMap[using_version]["RepoData"] = moblinrepo.Moblin_RepoData
-    dataMap[using_version]["PartData"] = partition.MeeGo_PartData
+    commandMap[using_version]["desktop"] = desktop.Mic_Desktop
+    commandMap[using_version]["repo"] = micrepo.Mic_Repo
+    commandMap[using_version]["bootloader"] = micboot.Mic_Bootloader
+    commandMap[using_version]["part"] = partition.Mic_Partition
+    commandMap[using_version]["partition"] = partition.Mic_Partition
+    dataMap[using_version]["RepoData"] = micrepo.Mic_RepoData
+    dataMap[using_version]["PartData"] = partition.Mic_PartData
     superclass = ksversion.returnClassForVersion(version=using_version)
 
     class KSHandlers(superclass):

diff --git a/mic/kickstart/custom_commands/__init__.py b/mic/kickstart/custom_commands/__init__.py
index dcfb56e..04d2a6d 100644 (file)
--- a/mic/kickstart/custom_commands/__init__.py
+++ b/mic/kickstart/custom_commands/__init__.py
@@ -1,10 +1,10 @@
 import desktop
-import moblinrepo
+import micrepo
 import partition
 
 __all__ = (
-    "Moblin_Desktop",
-    "Moblin_Repo",
-    "Moblin_RepoData",
-    "MeeGo_Partition",
+    "Mic_Desktop",
+    "Mic_Repo",
+    "Mic_RepoData",
+    "Mic_Partition",
 )

diff --git a/mic/kickstart/custom_commands/desktop.py b/mic/kickstart/custom_commands/desktop.py
index ab3f82f..8b0d0df 100644 (file)
--- a/mic/kickstart/custom_commands/desktop.py
+++ b/mic/kickstart/custom_commands/desktop.py
@@ -21,7 +21,7 @@ from pykickstart.base import *
 from pykickstart.errors import *
 from pykickstart.options import *
 
-class Moblin_Desktop(KickstartCommand):
+class Mic_Desktop(KickstartCommand):
     def __init__(self, writePriority=0,
                        defaultdesktop=None,
                        defaultdm=None,

diff --git a/mic/kickstart/custom_commands/micboot.py b/mic/kickstart/custom_commands/micboot.py
index aca200c..66d1678 100644 (file)
--- a/mic/kickstart/custom_commands/micboot.py
+++ b/mic/kickstart/custom_commands/micboot.py
@@ -22,7 +22,7 @@ from pykickstart.errors import *
 from pykickstart.options import *
 from pykickstart.commands.bootloader import *
 
-class Moblin_Bootloader(F8_Bootloader):
+class Mic_Bootloader(F8_Bootloader):
     def __init__(self, writePriority=10, appendLine="", driveorder=None,
                  forceLBA=False, location="", md5pass="", password="",
                  upgrade=False, menus=""):

diff --git a/mic/kickstart/custom_commands/moblinrepo.py b/mic/kickstart/custom_commands/micrepo.py
similarity index 98%
rename from mic/kickstart/custom_commands/moblinrepo.py
rename to mic/kickstart/custom_commands/micrepo.py
index f2da6fe..8f14a5d 100644 (file)
--- a/mic/kickstart/custom_commands/moblinrepo.py
+++ b/mic/kickstart/custom_commands/micrepo.py
@@ -22,7 +22,7 @@ from pykickstart.errors import *
 from pykickstart.options import *
 from pykickstart.commands.repo import *
 
-class Moblin_RepoData(F8_RepoData):
+class Mic_RepoData(F8_RepoData):
     def __init__(self, baseurl="", mirrorlist="", name="", priority=None,
                  includepkgs=[], excludepkgs=[], save=False, proxy=None,
                  proxy_username=None, proxy_password=None, debuginfo=False,
@@ -67,7 +67,7 @@ class Moblin_RepoData(F8_RepoData):
 
         return retval
 
-class Moblin_Repo(F8_Repo):
+class Mic_Repo(F8_Repo):
     def __init__(self, writePriority=0, repoList=None):
         F8_Repo.__init__(self, writePriority, repoList)
 

diff --git a/mic/kickstart/custom_commands/partition.py b/mic/kickstart/custom_commands/partition.py
index 1e458e5..bb63e10 100644 (file)
--- a/mic/kickstart/custom_commands/partition.py
+++ b/mic/kickstart/custom_commands/partition.py
@@ -17,7 +17,7 @@
 
 from pykickstart.commands.partition import *
 
-class MeeGo_PartData(FC4_PartData):
+class Mic_PartData(FC4_PartData):
     removedKeywords = FC4_PartData.removedKeywords
     removedAttrs = FC4_PartData.removedAttrs
 
@@ -37,7 +37,7 @@ class MeeGo_PartData(FC4_PartData):
             retval += " --extoptions=%s" % self.extopts
         return retval
 
-class MeeGo_Partition(FC4_Partition):
+class Mic_Partition(FC4_Partition):
     removedKeywords = FC4_Partition.removedKeywords
     removedAttrs = FC4_Partition.removedAttrs