summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <uberlord@gentoo.org>2006-07-28 00:11:43 +0000
committerRoy Marples <uberlord@gentoo.org>2006-07-28 00:11:43 +0000
commitb7e26c86ca6e1ab9a11355e88e497a96d5e8ec54 (patch)
treec1ffb746852461cc6634c72836a1eadb0cf4f4de /net-misc/dhcp/files/dhcp-3.0.3-dhclient-hostname.patch
parentVersion bump for slang, slotted to be installed side-by-side with slang 1.x. ... (diff)
downloadgentoo-2-b7e26c86ca6e1ab9a11355e88e497a96d5e8ec54.tar.gz
gentoo-2-b7e26c86ca6e1ab9a11355e88e497a96d5e8ec54.tar.bz2
gentoo-2-b7e26c86ca6e1ab9a11355e88e497a96d5e8ec54.zip
Version bump and fix hostname patch slightly.
(Portage version: 2.1.1_pre3-r5)
Diffstat (limited to 'net-misc/dhcp/files/dhcp-3.0.3-dhclient-hostname.patch')
-rw-r--r--net-misc/dhcp/files/dhcp-3.0.3-dhclient-hostname.patch15
1 files changed, 9 insertions, 6 deletions
diff --git a/net-misc/dhcp/files/dhcp-3.0.3-dhclient-hostname.patch b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-hostname.patch
index 318f3d3156e6..9a6e7b9698b1 100644
--- a/net-misc/dhcp/files/dhcp-3.0.3-dhclient-hostname.patch
+++ b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-hostname.patch
@@ -1,13 +1,16 @@
---- client/scripts/linux
-+++ client/scripts/linux
-@@ -138,9 +138,8 @@
+--- client/scripts/linux
++++ client/scripts/linux
+@@ -138,10 +138,12 @@
[ x$reason = xREBIND ] || [ x$reason = xREBOOT ]; then
current_hostname=`hostname`
if [ x$current_hostname = x ] || \
+ [ x$current_hostname = "x(none)" ] || \
++ [ x$current_hostname = xlocalhost ] || \
[ x$current_hostname = x$old_host_name ]; then
-- if [ x$current_hostname = x ] || \
-- [ x$new_host_name != x$old_host_name ]; then
- hostname $new_host_name
+ if [ x$current_hostname = x ] || \
+ [ x$new_host_name != x$old_host_name ]; then
+- hostname $new_host_name
++ hostname "$new_host_name"
fi
fi
+