From 76f16368ae92051e6803d7490d5c6329e2b84713 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Fri, 12 Nov 2004 15:57:17 +0000 Subject: 2004-11-12 Jeremy Katz * bootloader.py: Add patch from HJ Lu to fix popping hang in cases where boot loader isn't being installed (#138932) * packages.py (copyAnacondaLogs): Copy in the X log too per pnasrat's request. --- ChangeLog | 8 ++++++++ bootloader.py | 8 ++++++-- packages.py | 3 ++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 368610335..97db7536a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2004-11-12 Jeremy Katz + + * bootloader.py: Add patch from HJ Lu to fix popping hang in cases + where boot loader isn't being installed (#138932) + + * packages.py (copyAnacondaLogs): Copy in the X log too per + pnasrat's request. + 2004-11-11 Jeremy Katz * iw/partition_ui_helpers_gui.py (mountptchangeCB): Automatically diff --git a/bootloader.py b/bootloader.py index 07707571c..6d0d38981 100644 --- a/bootloader.py +++ b/bootloader.py @@ -127,6 +127,8 @@ def writeBootloader(intf, instRoot, fsset, bl, langs, comps): if kernelLabel is None: log("unable to find default image, bailing") + if not justConfigFile: + w.pop() return plainLabelUsed = 0 @@ -155,9 +157,11 @@ def writeBootloader(intf, instRoot, fsset, bl, langs, comps): try: bl.write(instRoot, fsset, bl, langs, kernelList, otherList, defaultDev, justConfigFile, intf) - w.pop() + if not justConfigFile: + w.pop() except BootyNoKernelWarning: - w.pop() + if not justConfigFile: + w.pop() if intf: intf.messageWindow(_("Warning"), _("No kernel packages were installed on your " diff --git a/packages.py b/packages.py index be291d58a..ab000b0fd 100644 --- a/packages.py +++ b/packages.py @@ -86,7 +86,8 @@ def writeKSConfiguration(id, instPath): def copyAnacondaLogs(instPath): log("Copying anaconda logs") for (fn, dest) in (("/tmp/anaconda.log", "anaconda.log"), - ("/tmp/syslog", "anaconda.syslog")): + ("/tmp/syslog", "anaconda.syslog"), + ("/tmp/ramfs/X.log", "anaconda.xlog")): if os.access(fn, os.R_OK): try: iutil.copyFile(fn, "%s/var/log/%s" %(instPath, dest)) -- cgit