[PATCH 1/3] Support the 'skipx' kickstart command

Will Woods wwoods at redhat.com
Mon Feb 24 21:12:41 UTC 2014


If the user specifies 'skipx', they don't want Xorg to come up. So make
sure our default target is 'multi-user.target' when skipx is True.

Note that skipx is executed after xconfig, which means that skipx
overrides xconfig. This seems like a sensible arrangement.
---
 pyanaconda/install.py   | 1 +
 pyanaconda/kickstart.py | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/pyanaconda/install.py b/pyanaconda/install.py
index 0742d6f..1c1ece1 100644
--- a/pyanaconda/install.py
+++ b/pyanaconda/install.py
@@ -72,6 +72,7 @@ def doConfiguration(storage, payload, ksdata, instClass):
         ksdata.lang.execute(storage, ksdata, instClass)
         ksdata.firewall.execute(storage, ksdata, instClass)
         ksdata.xconfig.execute(storage, ksdata, instClass)
+        ksdata.skipx.execute(storage, ksdata, instClass)
 
     if not flags.flags.imageInstall and not flags.flags.dirInstall:
         with progress_report(_("Writing network configuration")):
diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
index 7ab7151..f93d815 100644
--- a/pyanaconda/kickstart.py
+++ b/pyanaconda/kickstart.py
@@ -1539,6 +1539,13 @@ class XConfig(commands.xconfig.F14_XConfig):
         # now write it out
         desktop.write()
 
+class SkipX(commands.skipx.FC3_SkipX):
+    def execute(self, *args):
+        if self.skipx:
+            desktop = Desktop()
+            desktop.runlevel = 3
+            desktop.write()
+
 class ZFCP(commands.zfcp.F14_ZFCP):
     def parse(self, args):
         fcp = commands.zfcp.F14_ZFCP.parse(self, args)
@@ -1622,6 +1629,7 @@ commandMap = {
         "rootpw": RootPw,
         "selinux": SELinux,
         "services": Services,
+        "skipx": SkipX,
         "timezone": Timezone,
         "upgrade": Upgrade,
         "user": User,
-- 
1.8.5.3



More information about the anaconda-patches mailing list