summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2006-06-21 01:03:30 +0000
committerJeremy Katz <katzj@redhat.com>2006-06-21 01:03:30 +0000
commit6f56cefaa86e17b9c30bc2a831368b990e85fc5e (patch)
treeaeaf944ab9d58cf89cf7ab9c99ae56b21d5a5e24
parent2f0e1f763e864ef42dffe1517b1e50fce9db4299 (diff)
downloadanaconda-6f56cefaa86e17b9c30bc2a831368b990e85fc5e.tar.gz
anaconda-6f56cefaa86e17b9c30bc2a831368b990e85fc5e.tar.xz
anaconda-6f56cefaa86e17b9c30bc2a831368b990e85fc5e.zip
i2006-06-20 Jeremy Katz <katzj@redhat.com>
* iw/zfcp_gui.py (ZFCPWindow.getScreen): Fix fallout from anaconda class changes (#196097)
-rw-r--r--ChangeLog5
-rw-r--r--yuminstall.py6
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 312c8f559..135422244 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-20 Jeremy Katz <katzj@redhat.com>
+
+ * iw/zfcp_gui.py (ZFCPWindow.getScreen): Fix fallout from anaconda
+ class changes (#196097)
+
2006-06-20 Peter Jones <pjones@redhat.com>
* loader2/net.c (netlogger): don't pass our output to logMessage as a
diff --git a/yuminstall.py b/yuminstall.py
index cb43d11dd..3c156daa2 100644
--- a/yuminstall.py
+++ b/yuminstall.py
@@ -782,7 +782,7 @@ class YumBackend(AnacondaBackend):
if not foundkernel and os.path.exists("/proc/xen"):
try:
- kxen = getBestKernelByArch("kernel-xen", self.ayum)
+ kxen = getBestKernelByArch("kernel-xenU", self.ayum)
log.info("selecting kernel-xen package for kernel")
foundkernel = True
except PackageSackError:
@@ -1000,6 +1000,9 @@ class YumBackend(AnacondaBackend):
if os.access("/tmp/zfcp.conf", os.R_OK):
shutil.copyfile("/tmp/zfcp.conf",
anaconda.rootPath + "/etc/zfcp.conf")
+ anaconda.id.network.write(anaconda.rootPath)
+ anaconda.id.iscsi.write(anaconda.rootPath)
+ anaconda.id.zfcp.write(anaconda.rootPath)
# make a /etc/mtab so mkinitrd can handle certain hw (usb) correctly
f = open(anaconda.rootPath + "/etc/mtab", "w+")
@@ -1080,7 +1083,6 @@ class YumBackend(AnacondaBackend):
else:
w = anaconda.intf.waitWindow(_("Post Install"),
_("Performing post install configuration..."))
- anaconda.id.network.write(anaconda.rootPath)
self.copyExtraModules(anaconda)