[rhel7-branch 1/29] Use RHEL7 kickstart commands
bcl
installerbot-noreply at redhat.com
Tue Jun 2 00:31:02 UTC 2015
From: "Brian C. Lane" <bcl at redhat.com>
(cherry picked from commit 5817718c12256beeb60a00d855e03413c012c56e)
Related: rhbz#1196721
---
dracut/parse-kickstart | 4 ++--
pyanaconda/kickstart.py | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dracut/parse-kickstart b/dracut/parse-kickstart
index c62926b..3238ac5 100755
--- a/dracut/parse-kickstart
+++ b/dracut/parse-kickstart
@@ -32,7 +32,7 @@ import uuid
import glob
from pykickstart.parser import KickstartParser, preprocessKickstart
from pykickstart.sections import NullSection
-from pykickstart.version import returnClassForVersion
+from pykickstart.version import returnClassForVersion, RHEL7
from pykickstart.errors import KickstartError
# pylint: disable=wildcard-import
from pykickstart.constants import *
@@ -192,7 +192,7 @@ dracutCmds = {
'text': DisplayMode,
'bootloader': Bootloader,
}
-handlerclass = returnClassForVersion()
+handlerclass = returnClassForVersion(RHEL7)
class DracutHandler(handlerclass):
def __init__(self):
handlerclass.__init__(self, commandUpdates=dracutCmds)
diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
index ae783e2..4f6dc86 100644
--- a/pyanaconda/kickstart.py
+++ b/pyanaconda/kickstart.py
@@ -69,7 +69,7 @@
from pykickstart.parser import KickstartParser
from pykickstart.parser import Script as KSScript
from pykickstart.sections import NullSection, PackageSection, PostScriptSection, PreScriptSection, TracebackScriptSection
-from pykickstart.version import returnClassForVersion
+from pykickstart.version import returnClassForVersion, RHEL7
import logging
log = logging.getLogger("anaconda")
@@ -1843,7 +1843,7 @@ def parse(self, *args):
"VolGroupData": VolGroupData,
}
-superclass = returnClassForVersion()
+superclass = returnClassForVersion(RHEL7)
class AnacondaKSHandler(superclass):
AddonClassType = AddonData
--
To view this commit on github, visit https://github.com/rhinstaller/anaconda/commit/3c9d72e7a992c11eb960aa0d1ddf564bdcff71f0
More information about the anaconda-patches
mailing list