summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2005-05-23 21:43:05 +0000
committerJeremy Katz <katzj@redhat.com>2005-05-23 21:43:05 +0000
commit710f8908353300d295da493d039e5cd443a3dfdf (patch)
treedb10d9cc0ac011bbd590344e4050c78ea47626d9
parent6541b52699b6f95da920183f1edf01247c3b2640 (diff)
downloadanaconda-710f8908353300d295da493d039e5cd443a3dfdf.tar.gz
anaconda-710f8908353300d295da493d039e5cd443a3dfdf.tar.xz
anaconda-710f8908353300d295da493d039e5cd443a3dfdf.zip
2005-05-23 Jeremy Katz <katzj@redhat.com>
* bootloader.py (writeBootloader): Only update the default if we're setting the default to linux (#156678)
-rw-r--r--ChangeLog3
-rw-r--r--bootloader.py6
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f507c3bd5..84e88f56e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2005-05-23 Jeremy Katz <katzj@redhat.com>
+ * bootloader.py (writeBootloader): Only update the default if
+ we're setting the default to linux (#156678)
+
* hdrlist.py (DependencyChecker.callback): Make the comments a
little clearer
diff --git a/bootloader.py b/bootloader.py
index d6cbf0799..de9ca6665 100644
--- a/bootloader.py
+++ b/bootloader.py
@@ -156,7 +156,11 @@ def writeBootloader(intf, instRoot, fsset, bl, langs, comps):
f = open(instRoot + "/etc/sysconfig/kernel", "w+")
f.write("# UPDATEDEFAULT specifies if new-kernel-pkg should make\n"
"# new kernels the default\n")
- f.write("UPDATEDEFAULT=yes\n")
+ # only update the default if we're setting the default to linux (#156678)
+ if rootDev == defaultDev:
+ f.write("UPDATEDEFAULT=yes\n")
+ else:
+ f.write("UPDATEDEFAULT=no\n")
f.write("\n")
f.write("# DEFAULTKERNEL specifies the default kernel package type\n")
f.write("DEFAULTKERNEL=%s\n" %(defkern,))