diff options
| author | Jeremy Katz <katzj@redhat.com> | 2006-09-20 22:16:37 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2006-09-20 22:16:37 +0000 |
| commit | 2c3d4c7edf66915aca303f0dfd6f54cbf8afe999 (patch) | |
| tree | d33e50bf2892530f7a091c7b3559bbd3688f3293 /iw | |
| parent | 6b19416dcb18c2093036f321a5fb38571c6ebe75 (diff) | |
| download | anaconda-2c3d4c7edf66915aca303f0dfd6f54cbf8afe999.tar.gz anaconda-2c3d4c7edf66915aca303f0dfd6f54cbf8afe999.tar.xz anaconda-2c3d4c7edf66915aca303f0dfd6f54cbf8afe999.zip | |
2006-09-20 Jeremy Katz <katzj@redhat.com>
* textw/partition_text.py: Text mode support for iscsi and zfcp devices
* iw/autopart_type.py (PartitionTypeWindow.addIscsiDrive): Adjust
for new iscsi backend code.
* kickstart.py (AnacondaKSHandlers.doIscsi): Better iscsi syntax.
* iscsi.py: Improve support a bit so that we give a default
initiator name, have the framework for handling
usernames/passwords, and have cleaner code.
Diffstat (limited to 'iw')
| -rw-r--r-- | iw/autopart_type.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/iw/autopart_type.py b/iw/autopart_type.py index 0f5084b5b..2bff100f0 100644 --- a/iw/autopart_type.py +++ b/iw/autopart_type.py @@ -117,9 +117,9 @@ class PartitionTypeWindow(InstallWindow): # get the initiator name if it exists and don't allow changing # once set - if self.anaconda.id.iscsi.initiator: - e = dxml.get_widget("iscsiInitiatorEntry") - e.set_text(self.anaconda.id.iscsi.initiator) + e = dxml.get_widget("iscsiInitiatorEntry") + e.set_text(self.anaconda.id.iscsi.initiator) + if self.anaconda.id.iscsi.initiatorSet: # this is uglyyyy.... e.set_sensitive(False) while 1: @@ -137,8 +137,9 @@ class PartitionTypeWindow(InstallWindow): continue self.anaconda.id.iscsi.initiator = initiator - target = dxml.get_widget("iscsiAddrEntry").get_text() - target.strip() + target = dxml.get_widget("iscsiAddrEntry").get_text().strip() + user = dxml.get_widget("userEntry").get_text().strip() + pw = dxml.get_widget("passEntry").get_text().strip() err = None try: idx = target.rfind(":") @@ -156,10 +157,8 @@ class PartitionTypeWindow(InstallWindow): if err: self.intf.messageWindow(_("Error with Data"), "%s" %(msg,)) continue - self.anaconda.id.iscsi.targets.append(target) - self.anaconda.id.iscsi.discoverTarget(ip, port, self.intf) - self.anaconda.id.iscsi.loginTarget(ip) + self.anaconda.id.iscsi.addTarget(ip, port, user, pw, self.intf) break dialog.destroy() |