FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > Ubuntu > Ubuntu User

 
 
LinkBack Thread Tools
 
Old 03-23-2011, 08:03 PM
David Cantrell
 
Default Ensure new kernel is default in zipl.conf on upgrade installs (#683891)

Rather than writing out the entry name as just 'linux', attach the
kernel version so there is some description for the user at boot time.
Keep the order the same as we have in previous releases, but ensure the
most recent kernel is the default boot selection.
---
bootloader.py | 11 ++++-------
booty/s390.py | 4 ++--
2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/bootloader.py b/bootloader.py
index 5ef6729..8631f0b 100644
--- a/bootloader.py
+++ b/bootloader.py
@@ -184,19 +184,16 @@ def writeBootloader(anaconda):
w.pop()
return

- plainLabelUsed = 0
defkern = "kernel"
for (version, arch, nick) in
anaconda.backend.kernelVersionList(anaconda.rootPa th):
- if plainLabelUsed:
+ if nick != 'base':
+ defkern = "kernel-%s" %(nick,)
kernelList.append(("%s-%s" %(kernelLabel, nick),
"%s-%s" %(kernelLongLabel, nick),
version))
- else:
- kernelList.append((kernelLabel, kernelLongLabel, version))
- if nick != "base":
- defkern = "kernel-%s" %(nick,)
- plainLabelUsed = 1
+ else:
+ kernelList.append((kernelLabel, kernelLongLabel, version))

f = open(anaconda.rootPath + "/etc/sysconfig/kernel", "w+")
f.write("# UPDATEDEFAULT specifies if new-kernel-pkg should make
"
diff --git a/booty/s390.py b/booty/s390.py
index 40d7323..0101d96 100644
--- a/booty/s390.py
+++ b/booty/s390.py
@@ -131,7 +131,7 @@ class s390BootloaderInfo(bootloaderInfo):
f.write('[defaultboot]
')
if self.timeout:
f.write('timeout=%d
' % self.timeout)
- f.write('default=' + kernelList[0][0] + '
')
+ f.write('default=' + kernelList[-1][0] + '-' + kernelList[-1][2] + '
')
f.write('target=%s
' % (self.kernelLocation))

cfPath = "/boot/"
@@ -140,7 +140,7 @@ class s390BootloaderInfo(bootloaderInfo):
kernelFile = "%svmlinuz%s" % (cfPath, kernelTag)

initrd = self.makeInitrd(kernelTag, instRoot)
- f.write('[%s]
' % (label))
+ f.write('[%s-%s]
' % (label, version))
f.write(' image=%s
' % (kernelFile))
if initrd:
f.write(' ramdisk=%s%s
' %(self.kernelLocation, initrd))
--
1.7.1

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
 

Thread Tools




All times are GMT. The time now is 12:53 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org