diff options
| author | Dennis Gilmore <dennis@ausil.us> | 2010-02-26 15:59:58 -0600 |
|---|---|---|
| committer | Dennis Gilmore <dennis@ausil.us> | 2010-03-05 15:07:07 -0600 |
| commit | 79d4a99fe6f54f5167d99bd4fa97d79247b08f3a (patch) | |
| tree | 281d864f1e6fabe4fbd5b8d602c2835c5f2b85f7 | |
| parent | b8715426d5dc256465bba06460171ac6298abb15 (diff) | |
| download | anaconda-f12-branch.tar.gz anaconda-f12-branch.tar.xz anaconda-f12-branch.zip | |
Sparc bootloader config not written to /etcf12-branch
clean up sparc boot loader install so that it writes out and links
into /etc correctly.
| -rw-r--r-- | booty/sparc.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/booty/sparc.py b/booty/sparc.py index 22c4ab8b7..c6db4936a 100644 --- a/booty/sparc.py +++ b/booty/sparc.py @@ -1,7 +1,10 @@ +import string import os from booty import BootyNoKernelWarning +from util import getDiskPart from bootloaderInfo import * +import iutil class sparcBootloaderInfo(bootloaderInfo): def writeSilo(self, instRoot, bl, kernelList, @@ -35,7 +38,7 @@ class sparcBootloaderInfo(bootloaderInfo): f.write("message=%s\n" % (mf,)) f.write("timeout=%s\n" % (self.timeout or 50)) - (name, partNum) = getDiskPart(bootDev, self.storage) + (name, partNum) = getDiskPart(bootDev.name, self.storage) partno = partNum + 1 f.write("partition=%s\n" % (partno,)) @@ -86,9 +89,7 @@ class sparcBootloaderInfo(bootloaderInfo): backup = "%s/backup.b" % (cfPath,) sbinargs = ["/sbin/silo", "-f", "-C", cf, "-S", backup] - # TODO!!! FIXME!!! XXX!!! - # butil is not defined!!! - assume this is in rhpl now? - if butil.getSparcMachine() == "sun4u": + if (iutil.getSparcMachine() == "sun4u" or iutil.getSparcMachine() == "sun4v"): sbinargs += ["-u"] else: sbinargs += ["-U"] @@ -103,8 +104,8 @@ class sparcBootloaderInfo(bootloaderInfo): return rc if (not os.access(instRoot + "/etc/silo.conf", os.R_OK) and - os.access(instRoot + "/boot/etc/silo.conf", os.R_OK)): - os.symlink("../boot/etc/silo.conf", + os.access(instRoot + "/boot/silo.conf", os.R_OK)): + os.symlink("../boot/silo.conf", instRoot + "/etc/silo.conf") return 0 |