diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | bootloader.py | 14 |
2 files changed, 13 insertions, 5 deletions
@@ -1,5 +1,9 @@ 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. + * docs/kickstart-docs.txt: Update for nfs mount options. * docs/command-line.txt: Likewise. 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: |