merge from 6.1 branch

1 files changed, 14 insertions, 2 deletions

diff --git a/textw/lilo.py b/textw/lilo.py
index 4b828523a..6d1f6365a 100644
--- a/textw/lilo.py
+++ b/textw/lilo.py
@@ -2,6 +2,7 @@ import gettext
 from snack import *
 from textw.constants import *
 from text import _
+import string
 
 #cat = gettext.Catalog ("anaconda", "/usr/share/locale")
 #_ = cat.gettext
@@ -16,8 +17,12 @@ class LiloAppendWindow:
 		       "kernel, enter them now. If you don't need any or "
 		       "aren't sure, leave this blank."))
 
-        cb = Checkbox(_("Use linear mode (needed for some SCSI drives)"))
+        cb = Checkbox(_("Use linear mode (needed for some SCSI drives)"),
+		      isOn = todo.liloLinear)
 	entry = Entry(48, scroll = 1, returnExit = 1)
+	if todo.liloAppend:
+	    entry.set(todo.liloAppend)
+
 	buttons = ButtonBar(screen, [(_("OK"), "ok"), (_("Skip"), "skip"),  
 			     (_("Back"), "back") ] )
 
@@ -39,6 +44,12 @@ class LiloAppendWindow:
 	else:
 	    todo.skipLilo = 0
 
+	todo.liloLinear = cb.selected()
+	if entry.value():
+	    todo.liloAppend = string.strip(entry.value())
+	else:
+	    todo.liloAppend = None
+
 	return INSTALL_OK
 
 class LiloWindow:
@@ -147,7 +158,8 @@ class LiloImagesWindow:
 	buttons = ButtonBar(screen, [ (_("Ok"), "ok"), (_("Edit"), "edit"), 
 				      (_("Back"), "back") ] )
 
-	text = TextboxReflowed(55, _("The boot manager Red Hat uses can boot other " 
+	text = TextboxReflowed(55,
+		    _("The boot manager Red Hat uses can boot other " 
 		      "operating systems as well. You need to tell me " 
 		      "what partitions you would like to be able to boot " 
 		      "and what label you want to use for each of them."))