diff options
| author |   Roy Marples <uberlord@gentoo.org> | 2006-08-21 12:25:15 +0000 |
|---|---|---|
| committer | Roy Marples <uberlord@gentoo.org> | 2006-08-21 12:25:15 +0000 |
| commit | 8ffec9413bf0427f486bea5b811d1239caa4bfcb (patch) | |
| tree | a9877446276ca4a9a09c0a21a1dedb7311302ec1 | |
| parent | Start volumes after we have loaded modules. Don't do this in trunk - as we're... (diff) | |
| download | baselayout-8ffec9413bf0427f486bea5b811d1239caa4bfcb.tar.gz baselayout-8ffec9413bf0427f486bea5b811d1239caa4bfcb.tar.bz2 baselayout-8ffec9413bf0427f486bea5b811d1239caa4bfcb.zip | |
Allow dhcp clients to have global options - e.g. dhcpcd="-a"
svn path=/branches/baselayout-1_12/; revision=2199
| -rw-r--r-- | net-scripts/net/dhclient.sh | 2 | ||||
| -rw-r--r-- | net-scripts/net/dhcpcd.sh | 2 | ||||
| -rw-r--r-- | net-scripts/net/pump.sh | 2 | ||||
| -rw-r--r-- | net-scripts/net/udhcpc.sh | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/net-scripts/net/dhclient.sh b/net-scripts/net/dhclient.sh index d3b61961..f8f5dda0 100644 --- a/net-scripts/net/dhclient.sh +++ b/net-scripts/net/dhclient.sh @@ -67,7 +67,7 @@ dhclient_start() { # Load our default options opts="dhclient_${ifvar}" - opts="${!opts}" + opts="${!opts} ${dhclient}" local d="dhcp_${ifvar}" [[ -z ${!d} ]] && d="dhcp" diff --git a/net-scripts/net/dhcpcd.sh b/net-scripts/net/dhcpcd.sh index ce0883a5..213bb1c5 100644 --- a/net-scripts/net/dhcpcd.sh +++ b/net-scripts/net/dhcpcd.sh @@ -67,7 +67,7 @@ dhcpcd_start() { # Get our options opts="dhcpcd_${ifvar}" - opts="${!opts}" + opts="${!opts} ${dhcpcd}" # Map some generic options to dhcpcd d="dhcp_${ifvar}" diff --git a/net-scripts/net/pump.sh b/net-scripts/net/pump.sh index 26b1a15e..6a7b3916 100644 --- a/net-scripts/net/pump.sh +++ b/net-scripts/net/pump.sh @@ -67,7 +67,7 @@ pump_start() { interface_exists "${iface}" true || return 1 opts="pump_${ifvar}" - opts="${!opts}" + opts="${!opts} ${pump}" # Map some generic options to pump d="dhcp_${ifvar}" diff --git a/net-scripts/net/udhcpc.sh b/net-scripts/net/udhcpc.sh index 909c7843..c3741391 100644 --- a/net-scripts/net/udhcpc.sh +++ b/net-scripts/net/udhcpc.sh @@ -75,7 +75,7 @@ udhcpc_start() { interface_exists "${iface}" true || return 1 local ifvar=$(bash_variable "${iface}" ) opts= - opts="udhcpc_${ifvar}" + opts="udhcpc_${ifvar} ${udhcpc}" opts="${!opts}" d="dhcp_${ifvar}" |