summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2006-05-18 15:57:17 +0000
committerJeremy Katz <katzj@redhat.com>2006-05-18 15:57:17 +0000
commit917e2edd2df0c51a1538ab99003e515e9a03f342 (patch)
tree081a2d50d73a9455ceaff881203d975beaeed5f7
parent6e72852a3284fe014017f5c7d8e741b2f4fd9834 (diff)
downloadanaconda-917e2edd2df0c51a1538ab99003e515e9a03f342.tar.gz
anaconda-917e2edd2df0c51a1538ab99003e515e9a03f342.tar.xz
anaconda-917e2edd2df0c51a1538ab99003e515e9a03f342.zip
2006-05-18 Jeremy Katz <katzj@redhat.com>
* bootloader.py: Window isn't always there.
-rw-r--r--ChangeLog2
-rw-r--r--bootloader.py6
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b32a28e78..3a775e8a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2006-05-18 Jeremy Katz <katzj@redhat.com>
+ * bootloader.py: Window isn't always there.
+
* anaconda (Anaconda.setMethod): We need bootloader on CDs.
2006-05-18 Paul Nasrat <pnasrat@redhat.com>
diff --git a/bootloader.py b/bootloader.py
index 05699c277..0ac30bc12 100644
--- a/bootloader.py
+++ b/bootloader.py
@@ -147,7 +147,7 @@ def writeBootloader(anaconda):
else:
otherList.append((label, longlabel, dev))
- if kernelLabel is None and not flags.livecd:
+ if kernelLabel is None and not flags.livecd: # FIXME
log.error("unable to find default image, bailing")
if not justConfigFile:
w.pop()
@@ -196,7 +196,9 @@ def writeBootloader(anaconda):
_("No kernel packages were installed on your "
"system. Your boot loader configuration "
"will not be changed."))
- w.pop()
+
+ if not justConfigFile:
+ w.pop()
dosync()
# return instance of the appropriate bootloader for our arch