diff options
| author |   Roy Marples <uberlord@gentoo.org> | 2006-05-23 13:03:28 +0000 |
|---|---|---|
| committer | Roy Marples <uberlord@gentoo.org> | 2006-05-23 13:03:28 +0000 |
| commit | c795244693e6ffc5d856542911bc73261082b90f (patch) | |
| tree | 038cc918b3d18ea56f949a3b46929c4712562c84 /net-misc/dhcp/files/dhcp-3.0.3-dhclient-resolvconf.patch | |
| parent | Add patch from Martin Schlemmer (azarah) to fix bug #134100 (parallel make is... (diff) | |
| download | historical-c795244693e6ffc5d856542911bc73261082b90f.tar.gz historical-c795244693e6ffc5d856542911bc73261082b90f.tar.bz2 historical-c795244693e6ffc5d856542911bc73261082b90f.zip | |
dhclient-script now works with invalid, RFC violating but sometimes used
space seperated domain names, #134101 thanks to Jan Spitalnik.
Package-Manager: portage-2.1_rc2
Diffstat (limited to 'net-misc/dhcp/files/dhcp-3.0.3-dhclient-resolvconf.patch')
| -rw-r--r-- | net-misc/dhcp/files/dhcp-3.0.3-dhclient-resolvconf.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/net-misc/dhcp/files/dhcp-3.0.3-dhclient-resolvconf.patch b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-resolvconf.patch index 466697cf63aa..fac6b26a9723 100644 --- a/net-misc/dhcp/files/dhcp-3.0.3-dhclient-resolvconf.patch +++ b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-resolvconf.patch @@ -10,9 +10,9 @@ - echo nameserver $nameserver >>/etc/resolv.conf - done + if [ x$PEER_DNS = x ] || [ x$PEER_DNS = xyes ]; then -+ if [ x$new_domain_name != x ] || [ x$new_domain_name_servers != x ]; then ++ if [ "x$new_domain_name" != x ] || [ "x$new_domain_name_servers" != x ]; then + conf="# Generated by dhclient for interface $interface\n" -+ if [ x$new_domain_name != x ]; then ++ if [ "x$new_domain_name" != x ]; then + conf="${conf}search $new_domain_name\n" + fi + for nameserver in $new_domain_name_servers; do @@ -46,9 +46,9 @@ - ( touch /etc/resolv.conf ) - exit_status=$? + if [ x$PEER_DNS = x ] || [ x$PEER_DNS = xyes ]; then -+ if [ x$new_domain_name != x ] || [ x$new_domain_name_servers != x ]; then ++ if [ "x$new_domain_name" != x ] || [ "x$new_domain_name_servers" != x ]; then + conf="# Generated by dhclient for interface $interface\n" -+ if [ x$new_domain_name != x ]; then ++ if [ "x$new_domain_name" != x ]; then + conf="${conf}search $new_domain_name\n" fi - fi @@ -81,9 +81,9 @@ - echo nameserver $nameserver >>/etc/resolv.conf - done + if [ x$PEER_DNS = x ] || [ x$PEER_DNS = xyes ]; then -+ if [ x$new_domain_name != x ] || [ x$new_domain_name_servers != x ]; then ++ if [ "x$new_domain_name" != x ] || [ "x$new_domain_name_servers" != x ]; then + conf="# Generated by dhclient for interface $interface\n" -+ if [ x$new_domain_name != x ]; then ++ if [ "x$new_domain_name" != x ]; then + conf="${conf}search $new_domain_name\n" + fi + for nameserver in $new_domain_name_servers; do @@ -111,9 +111,9 @@ - echo nameserver $nameserver >>/etc/resolv.conf - done + if [ x$PEER_DNS = x ] || [ x$PEER_DNS = xyes ]; then -+ if [ x$new_domain_name != x ] || [ x$new_domain_name_servers != x ]; then ++ if [ "x$new_domain_name" != x ] || [ "x$new_domain_name_servers" != x ]; then + conf="# Generated by dhclient for interface $interface\n" -+ if [ x$new_domain_name != x ]; then ++ if [ "x$new_domain_name" != x ]; then + conf="${conf}search $new_domain_name\n" + fi + for nameserver in $new_domain_name_servers; do @@ -141,7 +141,7 @@ - echo nameserver $nameserver >>/etc/resolv.conf - done + if [ x$PEER_DNS = x ] || [ x$PEER_DNS = xyes ]; then -+ if [ x$new_domain_name != x ] || [ x$new_domain_name_servers != x ]; then ++ if [ "x$new_domain_name" != x ] || [ "x$new_domain_name_servers" != x ]; then + conf="# Generated by dhclient for interface $interface\n" + if [ x$new_domain_name != x ]; then + conf="${conf}search $new_domain_name\n" @@ -171,9 +171,9 @@ - echo nameserver $nameserver >>/etc/resolv.conf - done + if [ x$PEER_DNS = x ] || [ x$PEER_DNS = xyes ]; then -+ if [ x$new_domain_name != x ] || [ x$new_domain_name_servers != x ]; then ++ if [ "x$new_domain_name" != x ] || [ "x$new_domain_name_servers" != x ]; then + conf="# Generated by dhclient for interface $interface\n" -+ if [ x$new_domain_name != x ]; then ++ if [ "x$new_domain_name" != x ]; then + conf="${conf}search $new_domain_name\n" + fi + for nameserver in $new_domain_name_servers; do |