* [PATCH] Use dhclient.conf instead of -R
@ 2009-06-05 15:26 Seewer Philippe
[not found] ` <4A293933.80601-omB+W0Dpw2o@public.gmane.org>
0 siblings, 1 reply; 5+ messages in thread
From: Seewer Philippe @ 2009-06-05 15:26 UTC (permalink / raw)
To: <initramfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
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(-)
diff --git a/modules.d/40network/dhclient.conf
b/modules.d/40network/dhclient.conf
new file mode 100644
index 0000000..dbf5882
--- /dev/null
+++ b/modules.d/40network/dhclient.conf
@@ -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;
diff --git a/modules.d/40network/ifup b/modules.d/40network/ifup
index e347da5..b79cc0a 100755
--- a/modules.d/40network/ifup
+++ b/modules.d/40network/ifup
@@ -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() {
diff --git a/modules.d/40network/install b/modules.d/40network/install
index 836c57f..eb6cbcc 100755
--- a/modules.d/40network/install
+++ b/modules.d/40network/install
@@ -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 majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] Use dhclient.conf instead of -R
[not found] ` <4A293933.80601-omB+W0Dpw2o@public.gmane.org>
@ 2009-06-05 16:02 ` Bill Nottingham
[not found] ` <20090605160253.GJ5107-Zdt1ptygihhQcNjhGXsBABcY2uh10dtjAL8bYrjMMd8@public.gmane.org>
0 siblings, 1 reply; 5+ messages in thread
From: Bill Nottingham @ 2009-06-05 16:02 UTC (permalink / raw)
To: Seewer Philippe; +Cc: <initramfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
Seewer Philippe (philippe.seewer-omB+W0Dpw2o@public.gmane.org) said:
> diff --git a/modules.d/40network/install b/modules.d/40network/install
> index 836c57f..eb6cbcc 100755
> --- a/modules.d/40network/install
> +++ b/modules.d/40network/install
> @@ -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 majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Use dhclient.conf instead of -R
[not found] ` <20090605160253.GJ5107-Zdt1ptygihhQcNjhGXsBABcY2uh10dtjAL8bYrjMMd8@public.gmane.org>
@ 2009-06-05 16:54 ` Harald Hoyer
2009-06-05 18:13 ` Seewer Philippe
1 sibling, 0 replies; 5+ messages in thread
From: Harald Hoyer @ 2009-06-05 16:54 UTC (permalink / raw)
To: <initramfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
On 06/05/2009 06:02 PM, Bill Nottingham wrote:
> Seewer Philippe (philippe.seewer-omB+W0Dpw2o@public.gmane.org) said:
>> diff --git a/modules.d/40network/install b/modules.d/40network/install
>> index 836c57f..eb6cbcc 100755
>> --- a/modules.d/40network/install
>> +++ b/modules.d/40network/install
>> @@ -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 majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Use dhclient.conf instead of -R
[not found] ` <20090605160253.GJ5107-Zdt1ptygihhQcNjhGXsBABcY2uh10dtjAL8bYrjMMd8@public.gmane.org>
2009-06-05 16:54 ` Harald Hoyer
@ 2009-06-05 18:13 ` Seewer Philippe
[not found] ` <4A29603D.1090202-omB+W0Dpw2o@public.gmane.org>
1 sibling, 1 reply; 5+ messages in thread
From: Seewer Philippe @ 2009-06-05 18:13 UTC (permalink / raw)
To: Bill Nottingham; +Cc: <initramfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
Bill Nottingham wrote:
> Seewer Philippe (philippe.seewer-omB+W0Dpw2o@public.gmane.org) said:
>> diff --git a/modules.d/40network/install b/modules.d/40network/install
>> index 836c57f..eb6cbcc 100755
>> --- a/modules.d/40network/install
>> +++ b/modules.d/40network/install
>> @@ -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(-)
diff --git a/modules.d/40network/dhclient.conf
b/modules.d/40network/dhclient.conf
new file mode 100644
index 0000000..dbf5882
--- /dev/null
+++ b/modules.d/40network/dhclient.conf
@@ -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;
diff --git a/modules.d/40network/ifup b/modules.d/40network/ifup
index e347da5..b79cc0a 100755
--- a/modules.d/40network/ifup
+++ b/modules.d/40network/ifup
@@ -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() {
diff --git a/modules.d/40network/install b/modules.d/40network/install
index 836c57f..eb6cbcc 100755
--- a/modules.d/40network/install
+++ b/modules.d/40network/install
@@ -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 majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] Use dhclient.conf instead of -R
[not found] ` <4A29603D.1090202-omB+W0Dpw2o@public.gmane.org>
@ 2009-06-05 19:02 ` Warren Togami
0 siblings, 0 replies; 5+ messages in thread
From: Warren Togami @ 2009-06-05 19:02 UTC (permalink / raw)
To: initramfs
On 06/05/2009 02:13 PM, Seewer Philippe wrote:
>> 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
wtogami-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org
--
To unsubscribe from this list: send the line "unsubscribe initramfs" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2009-06-05 19:02 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-06-05 15:26 [PATCH] Use dhclient.conf instead of -R Seewer Philippe
[not found] ` <4A293933.80601-omB+W0Dpw2o@public.gmane.org>
2009-06-05 16:02 ` Bill Nottingham
[not found] ` <20090605160253.GJ5107-Zdt1ptygihhQcNjhGXsBABcY2uh10dtjAL8bYrjMMd8@public.gmane.org>
2009-06-05 16:54 ` Harald Hoyer
2009-06-05 18:13 ` Seewer Philippe
[not found] ` <4A29603D.1090202-omB+W0Dpw2o@public.gmane.org>
2009-06-05 19:02 ` Warren Togami
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.