diff options
| author | Chris Lumens <clumens@redhat.com> | 2009-03-19 15:00:27 -0400 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2009-03-19 17:02:17 -0400 |
| commit | bfc10b4c4432ac564379d1771bbbda64ac0400ab (patch) | |
| tree | 3a67c4df9ccb03b20a9e8ca2e7c1737607c236e4 /booty | |
| parent | 22ff5bd2d0e4f5b247c733c75ba466f9e99e8cad (diff) | |
| download | anaconda-bfc10b4c4432ac564379d1771bbbda64ac0400ab.tar.gz anaconda-bfc10b4c4432ac564379d1771bbbda64ac0400ab.tar.xz anaconda-bfc10b4c4432ac564379d1771bbbda64ac0400ab.zip | |
Fix writing the default= line in grub.conf (#490756).
This was caused by trying to compare an instance of an object with a string,
which of course is never going to work.
Diffstat (limited to 'booty')
| -rw-r--r-- | booty/bootloaderInfo.py | 2 | ||||
| -rw-r--r-- | booty/s390.py | 2 | ||||
| -rw-r--r-- | booty/x86.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/booty/bootloaderInfo.py b/booty/bootloaderInfo.py index 90073e279..8419645fa 100644 --- a/booty/bootloaderInfo.py +++ b/booty/bootloaderInfo.py @@ -333,7 +333,7 @@ class bootloaderInfo: rootDev = self.storage.fsset.rootDevice - if rootDev == defaultDev: + if rootDev.name == defaultDev.name: lilo.addEntry("default", kernelList[0][0]) else: lilo.addEntry("default", chainList[0][0]) diff --git a/booty/s390.py b/booty/s390.py index 655d028b8..8cddb053d 100644 --- a/booty/s390.py +++ b/booty/s390.py @@ -27,7 +27,7 @@ class s390BootloaderInfo(bootloaderInfo): rootDev = self.storage.fsset.rootDevice - if rootDev == defaultDev: + if rootDev.name == defaultDev.name: lilo.addEntry("default", kernelList[0][0]) else: lilo.addEntry("default", chainList[0][0]) diff --git a/booty/x86.py b/booty/x86.py index 05c9feb75..221186a41 100644 --- a/booty/x86.py +++ b/booty/x86.py @@ -184,7 +184,7 @@ class x86BootloaderInfo(efiBootloaderInfo): # get the default image to boot... we have to walk and find it # since grub indexes by where it is in the config file - if defaultDev == rootDev: + if defaultDev.name == rootDev.name: default = 0 else: # if the default isn't linux, it's the first thing in the |