This prevents calling find_program_in_path() repeatedly and having the log message "ISCSID is /sbin/iscsid" all over the place. --- pyanaconda/storage/iscsi.py | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/pyanaconda/storage/iscsi.py b/pyanaconda/storage/iscsi.py index a29fc36..3bd953b 100644 --- a/pyanaconda/storage/iscsi.py +++ b/pyanaconda/storage/iscsi.py @@ -45,18 +45,17 @@ INITIATOR_FILE="/etc/iscsi/initiatorname.iscsi" def has_iscsi(): global ISCSID - location = iutil.find_program_in_path("iscsid") - if location: - ISCSID = location - - if ISCSID == "" or not has_libiscsi: + + if not os.access("/sys/module/iscsi_tcp", os.X_OK): return False - log.info("ISCSID is %s" % (ISCSID,)) + if not ISCSID: + location = iutil.find_program_in_path("iscsid") + if not location: + return False + ISCSID = location + log.info("ISCSID is %s" % (ISCSID,)) - # make sure the module is loaded - if not os.access("/sys/module/iscsi_tcp", os.X_OK): - return False return True def randomIname(): -- 1.7.1.1 _______________________________________________ Anaconda-devel-list mailing list Anaconda-devel-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/anaconda-devel-list