diff options
| author | Michael Boelen <michael.boelen@cisofy.com> | 2020-12-15 16:10:34 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-15 16:10:34 +0300 |
| commit | d1d3882130f51f6343dd1a7b07e087c9cf2eba76 (patch) | |
| tree | 12a77e34530a3350c5a7ff882540df30702ead29 | |
| parent | b9f88181f303a02f6749e6fa0d5a553daf68017d (diff) | |
| parent | 73f39baca8a0a82b2a5a6adcd61b4234470ee242 (diff) | |
Merge pull request #1076 from Varbin/1075-solaris-hostid
Use first e1000 interface and break after match (for hostid generation on Solaris)
| -rw-r--r-- | include/functions | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/functions b/include/functions index b72e7156..c88674ba 100644 --- a/include/functions +++ b/include/functions @@ -1089,12 +1089,13 @@ ;; "Solaris") - INTERFACES_TO_TEST="e1000g1 net0" + INTERFACES_TO_TEST="net0 e1000g1 e1000g0" FOUND=0 for I in ${INTERFACES_TO_TEST}; do FIND=$(${IFCONFIGBINARY} -a | grep "^${I}") if [ ! "${FIND}" = "" ]; then FOUND=1; LogText "Found interface ${I} on Solaris" + break fi done if [ ${FOUND} -eq 1 ]; then @@ -1107,7 +1108,7 @@ ReportException "GetHostID" "Can not find sha1/sha1sum or openssl" fi else - ReportException "GetHostID" "No interface found op Solaris to create HostID" + ReportException "GetHostID" "No interface found on Solaris to create HostID" fi ;; |