Use dhclient.conf instead of -R
PATCH 1/1 Use dhclient.conf instead of -R
The Option -R does not exist vor older dhclient releases like those found in debian or ubuntu. Use a specific dhclient.conf instead to request further dhcp-options.
--- modules.d/40network/dhclient.conf | 3 +++ modules.d/40network/ifup | 6 +----- modules.d/40network/install | 1 + 3 files changed, 5 insertions(+), 5 deletions(-)
modules.d/40network/dhclient.conf new file +3 -0
@@ -0,0 +1,3 @@ +request subnet-mask, broadcast-address, time-offset, routers, + domain-name, domain-name-servers, domain-search, host-name, + root-path, interface-mtu;
modules.d/40network/ifup +1 -5
@@ -58,10 +58,6 @@ do_static() { } do_dhcp() { - reqs=subnet-mask,broadcast-address,routers,domain-name - reqs=${reqs},domain-name-servers,domain-search - reqs=${reqs},host-name,root-path,interface-mtu - for i in ip srv gw mask hostname; do eval '[ "$'$i'" ] && echo '$i'="$'$i'"' done > /tmp/net.$netif.override
@@ -70,7 +66,7 @@ do_dhcp() { # /sbin/dhclient-script will mark the netif up and generate the online # event for nfsroot # XXX add -V vendor class and option parsing per kernel - dhclient -1 -q -R ${reqs} -pf /tmp/dhclient.$netif.pid $netif + dhclient -1 -q -cf /sbin/dhclient.conf -pf /tmp/dhclient.$netif.pid $netif } ip_to_var() {
modules.d/40network/install +1 -0
@@ -13,6 +13,7 @@ done inst "$moddir/ifup" "/sbin/ifup" inst "$moddir/netroot" "/sbin/netroot" inst "$moddir/dhclient-script" "/sbin/dhclient-script" +inst "$moddir/dhclient.conf" "/sbin/dhclient.conf" instmods ecb arc4 inst_rules "$moddir/60-net.rules" inst_hook cmdline 99 "$moddir/dhcp-fallback.sh"
--
To unsubscribe from this list: send the line "unsubscribe initramfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
modules.d/40network/install done · line 16
Quoted 9 lines · Seewer Philippe
modules.d/40network/install +1
-0@@ -13,6 +13,7 @@ done inst "$moddir/ifup" "/sbin/ifup" inst "$moddir/netroot" "/sbin/netroot" inst "$moddir/dhclient-script" "/sbin/dhclient-script" +inst "$moddir/dhclient.conf" "/sbin/dhclient.conf"
We have a /etc on the initramfs ... conf files should go there.
Bill
--
To unsubscribe from this list: send the line "unsubscribe initramfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 13 lines · Bill Nottingham
modules.d/40network/install done · line 16
Quoted 9 lines · Seewer Philippe
modules.d/40network/install +1
-0@@ -13,6 +13,7 @@ done inst "$moddir/ifup" "/sbin/ifup" inst "$moddir/netroot" "/sbin/netroot" inst "$moddir/dhclient-script" "/sbin/dhclient-script" +inst "$moddir/dhclient.conf" "/sbin/dhclient.conf"We have a /etc on the initramfs ... conf files should go there.
agreed
--
To unsubscribe from this list: send the line "unsubscribe initramfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 12 lines · Bill Nottingham
modules.d/40network/install done · line 16
Quoted 9 lines · Seewer Philippe
modules.d/40network/install +1
-0@@ -13,6 +13,7 @@ done inst "$moddir/ifup" "/sbin/ifup" inst "$moddir/netroot" "/sbin/netroot" inst "$moddir/dhclient-script" "/sbin/dhclient-script" +inst "$moddir/dhclient.conf" "/sbin/dhclient.conf"We have a /etc on the initramfs ... conf files should go there.
right, I tend to forget that it seems. Thanks for pointing it out. Fixed patch below
--- modules.d/40network/dhclient.conf | 3 +++ modules.d/40network/ifup | 6 +----- modules.d/40network/install | 1 + 3 files changed, 5 insertions(+), 5 deletions(-)
modules.d/40network/dhclient.conf new file +3 -0
@@ -0,0 +1,3 @@ +request subnet-mask, broadcast-address, time-offset, routers, + domain-name, domain-name-servers, domain-search, host-name, + root-path, interface-mtu;
modules.d/40network/ifup +1 -5
@@ -58,10 +58,6 @@ do_static() { } do_dhcp() { - reqs=subnet-mask,broadcast-address,routers,domain-name - reqs=${reqs},domain-name-servers,domain-search - reqs=${reqs},host-name,root-path,interface-mtu - for i in ip srv gw mask hostname; do eval '[ "$'$i'" ] && echo '$i'="$'$i'"' done > /tmp/net.$netif.override
@@ -70,7 +66,7 @@ do_dhcp() { # /sbin/dhclient-script will mark the netif up and generate the online # event for nfsroot # XXX add -V vendor class and option parsing per kernel - dhclient -1 -q -R ${reqs} -pf /tmp/dhclient.$netif.pid $netif + dhclient -1 -q -cf /etc/dhclient.conf -pf /tmp/dhclient.$netif.pid $netif } ip_to_var() {
modules.d/40network/install +1 -0
@@ -13,6 +13,7 @@ done inst "$moddir/ifup" "/sbin/ifup" inst "$moddir/netroot" "/sbin/netroot" inst "$moddir/dhclient-script" "/sbin/dhclient-script" +inst "$moddir/dhclient.conf" "/etc/dhclient.conf" instmods ecb arc4 inst_rules "$moddir/60-net.rules" inst_hook cmdline 99 "$moddir/dhcp-fallback.sh"
--
To unsubscribe from this list: send the line "unsubscribe initramfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 4 lines · Seewer Philippe
Quoted 1 line
We have a /etc on the initramfs ... conf files should go there.
right, I tend to forget that it seems. Thanks for pointing it out. Fixed patch below
OK, this seems to be working with dhclient-4.1.0-20 in Fedora 11.
I suppose go ahead and push.
Warren Togami
[email protected]
--
To unsubscribe from this list: send the line "unsubscribe initramfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html