1 |
wellsi |
1.1 |
diff -ruN anaconda-13.21.215.p16/anaconda anaconda-13.21.215/anaconda |
2 |
|
|
--- anaconda-13.21.215.p16/anaconda 2013-09-10 11:58:55.000000000 -0700 |
3 |
|
|
+++ anaconda-13.21.215/anaconda 2014-03-19 13:42:34.000000000 -0700 |
4 |
|
|
@@ -898,7 +898,16 @@ |
5 |
|
|
# |
6 |
|
|
if not opts.display_mode: |
7 |
|
|
opts.display_mode = 'g' |
8 |
|
|
- |
9 |
|
|
+ |
10 |
|
|
+ # this lets install classes force text mode instlls |
11 |
|
|
+ if instClass.forceTextMode: |
12 |
|
|
+ stdoutLog.info(_("Install class forcing text mode installation")) |
13 |
|
|
+ opts.display_mode = 't' |
14 |
|
|
+ # we don't want to ask about vnc |
15 |
|
|
+ flags.vncquestion = False |
16 |
|
|
+ # we don't want to waste time probing |
17 |
|
|
+ opts.isHeadless = 1 |
18 |
|
|
+ |
19 |
|
|
# disable VNC over text question when not enough memory is available |
20 |
|
|
if iutil.memInstalled() < isys.MIN_GUI_RAM: |
21 |
|
|
flags.vncquestion = False |
22 |
|
|
@@ -934,11 +943,6 @@ |
23 |
|
|
# check memory again, with the real display mode: |
24 |
|
|
check_memory(opts) |
25 |
|
|
|
26 |
|
|
- # this lets install classes force text mode instlls |
27 |
|
|
- if instClass.forceTextMode: |
28 |
|
|
- stdoutLog.info(_("Install class forcing text mode installation")) |
29 |
|
|
- opts.display_mode = 't' |
30 |
|
|
- |
31 |
|
|
# |
32 |
|
|
# find out what video hardware is available to run installer |
33 |
|
|
# |
34 |
|
|
diff -ruN anaconda-13.21.215.p16/instdata.py anaconda-13.21.215/instdata.py |
35 |
|
|
--- anaconda-13.21.215.p16/instdata.py 2013-08-02 06:47:00.000000000 -0700 |
36 |
|
|
+++ anaconda-13.21.215/instdata.py 2014-03-19 13:44:19.000000000 -0700 |
37 |
|
|
@@ -142,8 +142,7 @@ |
38 |
|
|
|
39 |
|
|
self.anaconda.writeXdriver(self.anaconda.rootPath) |
40 |
|
|
|
41 |
|
|
- if not self.isHeadless: |
42 |
|
|
- self.keyboard.write (self.anaconda.rootPath) |
43 |
|
|
+ self.keyboard.write (self.anaconda.rootPath) |
44 |
|
|
|
45 |
|
|
self.timezone.write (self.anaconda.rootPath) |
46 |
|
|
|
47 |
|
|
@@ -263,8 +262,8 @@ |
48 |
|
|
f.write("url --url=%s%s\n" % (urllib.unquote(m), ssl)) |
49 |
|
|
|
50 |
|
|
self.instLanguage.writeKS(f) |
51 |
|
|
+ self.keyboard.writeKS(f) |
52 |
|
|
if not self.isHeadless: |
53 |
|
|
- self.keyboard.writeKS(f) |
54 |
|
|
self.network.writeKS(f) |
55 |
|
|
|
56 |
|
|
if self.rootPassword["isCrypted"]: |