diff options
| author | Jeremy Katz <katzj@redhat.com> | 2004-11-12 15:57:17 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2004-11-12 15:57:17 +0000 |
| commit | 76f16368ae92051e6803d7490d5c6329e2b84713 (patch) | |
| tree | 6be4d645b913d51bf1a921709cd4cb05c3319c45 | |
| parent | 20de3c4b1a02a7133a96f19e6c964a55175b2b45 (diff) | |
| download | anaconda-76f16368ae92051e6803d7490d5c6329e2b84713.tar.gz anaconda-76f16368ae92051e6803d7490d5c6329e2b84713.tar.xz anaconda-76f16368ae92051e6803d7490d5c6329e2b84713.zip | |
2004-11-12 Jeremy Katz <katzj@redhat.com>
* 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.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | bootloader.py | 8 | ||||
| -rw-r--r-- | packages.py | 3 |
3 files changed, 16 insertions, 3 deletions
@@ -1,3 +1,11 @@ +2004-11-12 Jeremy Katz <katzj@redhat.com> + + * 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 <katzj@redhat.com> * 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)) |