diff options
| author | Jeremy Katz <katzj@redhat.com> | 2006-07-21 20:48:38 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2006-07-21 20:48:38 +0000 |
| commit | 99ad0671eb01f670a7f55b8c998f58b1d2cb95cd (patch) | |
| tree | 8636bdd44f4c1e11fdaee419b466e51844cbdab0 /kickstart.py | |
| parent | 54cacc87f83c44282b91ff82b0f70b2e4dac5e50 (diff) | |
| download | anaconda-99ad0671eb01f670a7f55b8c998f58b1d2cb95cd.tar.gz anaconda-99ad0671eb01f670a7f55b8c998f58b1d2cb95cd.tar.xz anaconda-99ad0671eb01f670a7f55b8c998f58b1d2cb95cd.zip | |
2006-07-21 Jeremy Katz <katzj@redhat.com>
* iw/autopart_type.py (PartitionTypeWindow.addIscsiDrive): Show
dialog while iscsid is starting
* yuminstall.py (YumBackend.selectFSPackages): Ensure that
iscsi-initiator-utils gets installed if installing on iscsi
* kickstart.py (AnacondaKSHandlers.doIscsi): Fixes for new iscsi
setup, startup iscsi targets at iscsi config
* iscsi.py: Sleep after starting iscsid, ensure we get the port
correct, redirect output from iscsid to avoid spinning, fix
writing out iscsi config
Diffstat (limited to 'kickstart.py')
| -rw-r--r-- | kickstart.py | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/kickstart.py b/kickstart.py index ad5e1f6bb..2c9a006e5 100644 --- a/kickstart.py +++ b/kickstart.py @@ -189,7 +189,24 @@ class AnacondaKSHandlers(KickstartHandlers): id.iscsi.ipaddr = self.ksdata.iscsi["target"] id.iscsi.port = self.ksdata.iscsi["port"] - id.iscsi.initiator = self.ksdata.iscsi["initiator"] + + id.iscsi.initiator = self.ksdata.iscsi["initiator"] + + if self.ksdata.iscsi["target"]: + ip = t = self.ksdata.iscsi["target"] + port = None + if self.ksdata.iscsi["port"]: + t = "%s:%s" %(t, self.ksdata.iscsi["port"]) + port = self.ksdata.iscsi["port"] + id.iscsi.targets.append(t) + + # FIXME: have to startup iscsi now so that we know the disk later + log.info("added iscsi target: %s" %(t,)) + id.iscsi.discoverTarget(ip, port) + id.iscsi.loginTarget(ip) + + # FIXME: flush the drive dict so we figure drives out again + isys.flushDriveDict() def doKeyboard(self, id, args): KickstartHandlers.doKeyboard(self, args) |