Fix dhcp client variables, as pointed out by John Major.

svn path=/branches/baselayout-1_12/; revision=2393

6 files changed, 17 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 544e8f8b..9d935cfe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for Gentoo System Intialization ("rc") scripts
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPLv2
 
+  06 Dec 2006; Roy Marples <uberlord@gentoo.org>:
+
+    Fix dhcp client variables, as pointed out by John Major.
+
   05 Dec 2006; Roy Marples <uberlord@gentoo.org>:
 
     Obey the pppd noauth option, #104869 thanks to Bram Verweij.
diff --git a/net-scripts/conf.d/net.example b/net-scripts/conf.d/net.example
index e1f7d086..acbfd89e 100644
--- a/net-scripts/conf.d/net.example
+++ b/net-scripts/conf.d/net.example
@@ -648,6 +648,14 @@
 #nis_domain_eth0="domain"
 #nis_servers_eth0="192.168.0.2 192.168.0.3"
 
+# NOTE: Setting any of these will stamp on the files in question. So if you
+# don't specify dns_servers but you do specify dns_domain then no nameservers
+# will be listed in /etc/resolv.conf even if there were any there to start
+# with.
+# If this is an issue for you then maybe you should look into a resolv.conf
+# manager like resolvconf-gentoo to manage this file for you. All packages
+# that baselayout supports use resolvconf-gentoo if installed.
+
 #-----------------------------------------------------------------------------
 # Cable in/out detection
 # Sometimes the cable is in, others it's out. Obviously you don't want to
diff --git a/net-scripts/net/dhclient.sh b/net-scripts/net/dhclient.sh
index f8f5dda0..e7808ffe 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} ${dhclient}"
+	opts="${dhclient} ${!opts}"
 
 	local d="dhcp_${ifvar}"
 	[[ -z ${!d} ]] && d="dhcp"
diff --git a/net-scripts/net/dhcpcd.sh b/net-scripts/net/dhcpcd.sh
index 213bb1c5..a0d7a9de 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} ${dhcpcd}"
+	opts="${dhcpcd} ${!opts}"
 
 	# Map some generic options to dhcpcd
 	d="dhcp_${ifvar}"
diff --git a/net-scripts/net/pump.sh b/net-scripts/net/pump.sh
index 6a7b3916..831520af 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} ${pump}"
+	opts="${pump} ${!opts}"
 
 	# Map some generic options to pump
 	d="dhcp_${ifvar}"
diff --git a/net-scripts/net/udhcpc.sh b/net-scripts/net/udhcpc.sh
index 3dcf0610..c4e3ba0d 100644
--- a/net-scripts/net/udhcpc.sh
+++ b/net-scripts/net/udhcpc.sh
@@ -75,8 +75,8 @@ udhcpc_start() {
 	interface_exists "${iface}" true || return 1
 
 	local ifvar=$(bash_variable "${iface}" ) opts= 
-	opts="udhcpc_${ifvar} ${udhcpc}"
-	opts="${!opts}"
+	opts="udhcpc_${ifvar}"
+	opts="${udhcpc} ${!opts}"
 
 	d="dhcp_${ifvar}"
 	[[ -z ${!d} ]] && d="dhcp"