diff options
| author | Jeremy Katz <katzj@redhat.com> | 2006-05-01 20:06:17 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2006-05-01 20:06:17 +0000 |
| commit | 1f2fed5f184493efbccc3eb5586fff2c37dd1a0e (patch) | |
| tree | 64ac049dd6eed32a8ec8581d5954044ac0e1c292 /bootloader.py | |
| parent | ce7d1074660cdb83ba6f2a5cb1de69e594bd6b27 (diff) | |
| download | anaconda-1f2fed5f184493efbccc3eb5586fff2c37dd1a0e.tar.gz anaconda-1f2fed5f184493efbccc3eb5586fff2c37dd1a0e.tar.xz anaconda-1f2fed5f184493efbccc3eb5586fff2c37dd1a0e.zip | |
2006-05-01 Jeremy Katz <katzj@redhat.com>
* bootloader.py (writeBootloader): Don't traceback if there's no
rootdev (eg, rootpath mode) so that we can have a bootloader setup
for live CDs.
Diffstat (limited to 'bootloader.py')
| -rw-r--r-- | bootloader.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/bootloader.py b/bootloader.py index 52cc0c8ad..5aa80f25e 100644 --- a/bootloader.py +++ b/bootloader.py @@ -4,12 +4,12 @@ # Erik Troan <ewt@redhat.com> # Jeremy Katz <katzj@redhat.com> # -# Copyright 2001-2002 Red Hat, Inc. +# Copyright 2001-2006 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU -# library public license. +# general public license. # -# You should have received a copy of the GNU Library Public License +# You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # @@ -124,14 +124,18 @@ def writeBootloader(intf, instRoot, fsset, bl, langs, backend): kernelList = [] otherList = [] - rootDev = fsset.getEntryByMountPoint('/').device.getDevice() + root = fsset.getEntryByMountPoint('/') + if root: + rootDev = root.device.getDevice() + else: + rootDev = None defaultDev = bl.images.getDefault() kernelLabel = None kernelLongLabel = None for (dev, (label, longlabel, type)) in bl.images.getImages().items(): - if dev == rootDev: + if (dev == rootDev) or (rootDev is None and kernelLabel is None): kernelLabel = label kernelLongLabel = longlabel elif dev == defaultDev: |