| 1 |
slords |
1.3 |
From 7fa5d177991c47180690c1e38ff0271b2a30b082 Mon Sep 17 00:00:00 2001 |
| 2 |
slords |
1.1 |
From: Shad L. Lords <slords@mail.com> |
| 3 |
|
|
Date: Mon, 19 Oct 2009 08:34:43 -0600 |
| 4 |
|
|
Subject: [PATCH] Make install headless but still write keyboard info out |
| 5 |
|
|
|
| 6 |
|
|
--- |
| 7 |
|
|
anaconda | 6 ++++++ |
| 8 |
|
|
instdata.py | 5 ++--- |
| 9 |
|
|
2 files changed, 8 insertions(+), 3 deletions(-) |
| 10 |
|
|
|
| 11 |
|
|
diff --git a/anaconda b/anaconda |
| 12 |
slords |
1.2 |
index ca23c11..a347af6 100755 |
| 13 |
slords |
1.1 |
--- a/anaconda |
| 14 |
|
|
+++ b/anaconda |
| 15 |
slords |
1.2 |
@@ -751,6 +751,9 @@ if __name__ == "__main__": |
| 16 |
slords |
1.1 |
else: |
| 17 |
|
|
opts.display_mode = 'g' |
| 18 |
|
|
|
| 19 |
|
|
+ # we don't want to ask about vnc |
| 20 |
|
|
+ flags.vncquestion = False |
| 21 |
|
|
+ |
| 22 |
|
|
#we prefer vnc over text mode, so ask about that, but only if the KS file doesn't specify anything special |
| 23 |
|
|
if opts.display_mode == 't' and flags.vncquestion: |
| 24 |
|
|
title = _("Would you like to use VNC?") |
| 25 |
slords |
1.2 |
@@ -771,6 +774,9 @@ if __name__ == "__main__": |
| 26 |
slords |
1.1 |
import instdata |
| 27 |
|
|
import floppy |
| 28 |
|
|
|
| 29 |
|
|
+ # we don't want to waste time probing |
| 30 |
|
|
+ opts.isHeadless = 1 |
| 31 |
|
|
+ |
| 32 |
|
|
if not opts.isHeadless: |
| 33 |
|
|
try: |
| 34 |
|
|
import xsetup |
| 35 |
|
|
diff --git a/instdata.py b/instdata.py |
| 36 |
|
|
index f6903f3..e747f09 100644 |
| 37 |
|
|
--- a/instdata.py |
| 38 |
|
|
+++ b/instdata.py |
| 39 |
|
|
@@ -145,8 +145,7 @@ class InstallData: |
| 40 |
|
|
def write(self): |
| 41 |
|
|
self.instLanguage.write (self.anaconda.rootPath) |
| 42 |
|
|
|
| 43 |
|
|
- if not self.isHeadless: |
| 44 |
|
|
- self.keyboard.write (self.anaconda.rootPath) |
| 45 |
|
|
+ self.keyboard.write (self.anaconda.rootPath) |
| 46 |
|
|
|
| 47 |
|
|
self.timezone.write (self.anaconda.rootPath) |
| 48 |
|
|
|
| 49 |
|
|
@@ -264,8 +263,8 @@ class InstallData: |
| 50 |
|
|
f.write("key %s\n" %(self.instClass.installkey,)) |
| 51 |
|
|
|
| 52 |
|
|
self.instLanguage.writeKS(f) |
| 53 |
|
|
+ self.keyboard.writeKS(f) |
| 54 |
|
|
if not self.isHeadless: |
| 55 |
|
|
- self.keyboard.writeKS(f) |
| 56 |
|
|
self.xsetup.writeKS(f, self.desktop, self.ksdata) |
| 57 |
|
|
self.network.writeKS(f) |
| 58 |
|
|
self.zfcp.writeKS(f) |
| 59 |
|
|
-- |
| 60 |
|
|
1.5.5.6 |
| 61 |
|
|
|
Parent Directory
| 
Revision Log
| 
Revision Graph
