summaryrefslogtreecommitdiffstats
path: root/anaconda
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2003-07-08 03:00:53 +0000
committerJeremy Katz <katzj@redhat.com>2003-07-08 03:00:53 +0000
commit459119c94529602d08de465b7ebfa4871d328081 (patch)
tree369a7eb643938d6d51ef6f2d0c46561e61dcc0ae /anaconda
parent390977d3ee0ebc010168ce04573f63ae15458718 (diff)
downloadanaconda-459119c94529602d08de465b7ebfa4871d328081.tar.gz
anaconda-459119c94529602d08de465b7ebfa4871d328081.tar.xz
anaconda-459119c94529602d08de465b7ebfa4871d328081.zip
massive merge from taroon branch. changes are all over the place, but a
summary of looking through the diff is * clean up warnings, we build with -Wall -Werror here too * product.img stuff * max logical partitions enforcement * 1 TB max fs size * ethtool stuff * autopart in kickstart * driver disk fixes * RHEL upgrade stuff * network driver disks * variant pkgorder/tree splitting
Diffstat (limited to 'anaconda')
-rwxr-xr-xanaconda9
1 files changed, 2 insertions, 7 deletions
diff --git a/anaconda b/anaconda
index 1bb28bb15..8c682b535 100755
--- a/anaconda
+++ b/anaconda
@@ -253,19 +253,13 @@ def setupRhplUpdates():
# For anaconda in test mode
if (os.path.exists('isys')):
- sys.path.append('libfdisk')
- sys.path.append('balkan')
- sys.path.append('gnome-map')
sys.path.append('isys')
sys.path.append('textw')
sys.path.append('iw')
- sys.path.append('installclasses')
- sys.path.append('iconvmodule')
else:
sys.path.append('/usr/lib/anaconda')
sys.path.append('/usr/lib/anaconda/textw')
sys.path.append('/usr/lib/anaconda/iw')
- sys.path.append('/usr/lib/anaconda/installclasses')
if (os.path.exists('booty')):
sys.path.append('booty')
@@ -684,6 +678,7 @@ if not instClass:
# this lets install classes force text mode instlls
if instClass.forceTextMode:
+ dup_log(_("Install class forcing text mode installation"))
display_mode = 't'
#
@@ -753,7 +748,7 @@ if not flags.test and not os.access("/mnt/runtime/usr/X11R6/bin/XFree86", os.X_O
if not isHeadless:
# if no mouse we force text mode
mousedev = mousehw.get()
- if display_mode == 'g' and mousedev[0] == "No - mouse":
+ if ksfile is None and display_mode == 'g' and mousedev[0] == "No - mouse":
# ask for the mouse type
import rhpl.mouse as mouse