diff options
| author | Chris Lumens <clumens@redhat.com> | 2009-06-05 10:59:29 -0400 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2009-06-05 16:12:33 -0400 |
| commit | 34ed3c31021d7139de8f0e84215a46769abdb992 (patch) | |
| tree | 0eac7ad7090a6a7d506f8c5595603fd2bb780b29 /booty/sparc.py | |
| parent | 5247763ce8b9d61aed0f9cec552d69bff7829a95 (diff) | |
| download | anaconda-34ed3c31021d7139de8f0e84215a46769abdb992.tar.gz anaconda-34ed3c31021d7139de8f0e84215a46769abdb992.tar.xz anaconda-34ed3c31021d7139de8f0e84215a46769abdb992.zip | |
Catch errors from bootloader installation and tell the user (#502210).
Diffstat (limited to 'booty/sparc.py')
| -rw-r--r-- | booty/sparc.py | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/booty/sparc.py b/booty/sparc.py index 39b84f167..b12b20769 100644 --- a/booty/sparc.py +++ b/booty/sparc.py @@ -94,18 +94,20 @@ class sparcBootloaderInfo(bootloaderInfo): sbinargs += ["-U"] if not flags.test: - iutil.execWithRedirect(sbinargs[0], - sbinargs[1:], - stdout = "/dev/tty5", - stderr = "/dev/tty5", - root = instRoot) + rc = iutil.execWithRedirect(sbinargs[0], + sbinargs[1:], + stdout = "/dev/tty5", + stderr = "/dev/tty5", + root = instRoot) + if rc: + 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", instRoot + "/etc/silo.conf") - return "" + return 0 def setPassword(self, val, isCrypted = 1): # silo just handles the password unencrypted @@ -114,8 +116,8 @@ class sparcBootloaderInfo(bootloaderInfo): def write(self, instRoot, bl, kernelList, chainList, defaultDev, justConfig): if len(kernelList) >= 1: - self.writeSilo(instRoot, bl, kernelList, chainList, - defaultDev, justConfig) + return self.writeSilo(instRoot, bl, kernelList, chainList, + defaultDev, justConfig) else: raise BootyNoKernelWarning |