FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > Debian > Debian User

 
 
LinkBack Thread Tools
 
Old 02-12-2009, 10:30 AM
Martin Sivak
 
Default Changes to make transition to NM-iBFT easier and fix for the required iscsi-initiator-utils version

---
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-3

BuildRequires: audit-libs-devel
BuildRequires: 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.c
index 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");
}
@@ -254,6 +254,9 @@ void setupIfaceStruct(iface_t * iface, struct loaderData_s * loaderData) {
iface->ipv4method = IPV4_DHCP_METHOD;
logMessage(INFO, "iBFT doesn't know what NIC to use - falling back to DHCP");
}
+ else if(ibft_iface_dhcp()){
+ iface->ipv4method = IPV4_IBFT_DHCP_METHOD;
+ }
if(devmacaddr) free(devmacaddr);
}
/* this is how we specify dhcp */
@@ -1268,6 +1271,8 @@ int writeEnabledNetInfo(iface_t *iface) {
if(ibft_iface_ip()) fprintf(fp, "IPADDR=%s
", ibft_iface_ip());
if(ibft_iface_mask()) fprintf(fp, "NETMASK=%s
", ibft_iface_mask());
if(ibft_iface_gw()) fprintf(fp, "GATEWAY=%s
", ibft_iface_gw());
+ else if (iface->ipv4method == IPV4_IBFT_DHCP_METHOD) {
+ fprintf(fp, "BOOTPROTO=dhcp
");
else if (iface->ipv4method == IPV4_DHCP_METHOD) {
fprintf(fp, "BOOTPROTO=dhcp
");
} else if (iface->ipv4method == IPV4_MANUAL_METHOD) {
--
1.5.4.3

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
 

Thread Tools




All times are GMT. The time now is 10:12 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org