Martin Sivak wrote:
--- anaconda.spec | 2 +- isys/iface.h | 2 +- loader/net.c | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/anaconda.spec b/anaconda.spec index fd00cf3..50048a7 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -38,7 +38,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %define dbusver 1.2.3 %define createrepover 0.4.7 %define yumutilsver 1.1.11-3 -%define iscsiver 6.2.0.870 +%define iscsiver 6.2.0.870-3BuildRequires: audit-libs-develBuildRequires: booty diff --git a/isys/iface.h b/isys/iface.h index e20c2b4..ad10b64 100644 --- a/isys/iface.h +++ b/isys/iface.h @@ -30,7 +30,7 @@ /* Enumerated types used in iface.c as well as loader's network code */ enum { IPUNUSED, IPV4, IPV6 };-enum { IPV4_UNUSED_METHOD, IPV4_DHCP_METHOD, IPV4_MANUAL_METHOD, IPV4_IBFT_METHOD };+enum { IPV4_UNUSED_METHOD, IPV4_DHCP_METHOD, IPV4_MANUAL_METHOD, IPV4_IBFT_METHOD, IPV4_IBFT_DHCP_METHOD }; enum { IPV6_UNUSED_METHOD, IPV6_AUTO_METHOD, IPV6_DHCP_METHOD, IPV6_MANUAL_METHOD };diff --git a/loader/net.c b/loader/net.cindex 7ee0053..e59c68e 100644 --- a/loader/net.c +++ b/loader/net.c @@ -245,7 +245,7 @@ void setupIfaceStruct(iface_t * iface, struct loaderData_s * loaderData) { iface->isiBFT = 1;/* Problems with getting the info from iBFT or iBFT uses dhcp*/- if(!devmacaddr || !ibft_present() || ibft_iface_dhcp()){ + if(!devmacaddr || !ibft_present()){ iface->ipv4method = IPV4_DHCP_METHOD; logMessage(INFO, "iBFT is not present or is configured to use DHCP"); }
The logMessage message is wrong now. Rest of the patch looks good, Regards, Hans _______________________________________________ Anaconda-devel-list mailing list Anaconda-devel-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/anaconda-devel-list
