diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | anaconda | 3 | ||||
| -rw-r--r-- | iscsi.py | 14 | ||||
| -rw-r--r-- | iw/iscsi_gui.py | 4 |
4 files changed, 22 insertions, 5 deletions
@@ -1,5 +1,11 @@ 2006-06-15 Jeremy Katz <katzj@redhat.com> + * iw/iscsi_gui.py (iscsiWindow.getNext): Hack for iscsi to stabilize + + * iscsi.py (iscsi.write): Write out iscsi config bits + + * anaconda (opts.iscsi): Actually handle the iscsi flag + * loader2/net.c: Hack for s390 to work for now * isys/isys.py (inet_ntoa): Fix on 64bit machines @@ -686,6 +686,9 @@ if __name__ == "__main__": if len(cargs[1]) > 0: vncconnectport = cargs[1] + if opts.iscsi: + flags.iscsi = 1 + # probing for hardware on an s390 seems silly... if rhpl.getArch() == "s390": opts.isHeadless = True @@ -110,15 +110,19 @@ class iscsi: stdout = "/dev/tty5", stderr="/dev/tty5") self.action("--login") - self.iscsidStarted = True; + self.iscsidStarted = True def writeKS(self): # XXX Useful if we have auto-generated kickstart files. return - def write(self): - # XXX copy config files and any files needed by mkinitrd, depends on - # mkinitrd and open-iscsi work in progress. - return + def write(self, instPath): + fd = os.open(instPath + INITIATOR_FILE, os.O_RDWR | os.O_CREAT) + os.write(fd, "InitiatorName=%s\n" %(self.initiator)) + os.close(fd) + + if not os.path.isdir(instPath + "/var/db/iscsi"): + iutil.mkdirChain(instPath + "/var/db/iscsi") + shutil.copytree("/var/db/iscsi", instPath + "/var/db/iscsi") # vim:tw=78:ts=4:et:sw=4 diff --git a/iw/iscsi_gui.py b/iw/iscsi_gui.py index f58ab874b..efeefc3ff 100644 --- a/iw/iscsi_gui.py +++ b/iw/iscsi_gui.py @@ -39,7 +39,11 @@ class iscsiWindow(InstallWindow): self.iscsi.port = self.port.get_text() self.iscsi.initiator = self.initiator.get_text() + w = self.intf.waitWindow(_("Initializing iSCSI initiator"), "") self.iscsi.startup() + import time # XXX mmmm. hacktastic. + time.sleep(5) + w.pop() return None |