tags 648676 patch
thanks
I'll upload this NMU later the day. This removes the option to set a
hostname from the script completely. Further changes needs to move this
file to be a conffile.
Bastian
--
Where there's no emotion, there's no motive for violence.
-- Spock, "Dagger of the Mind", stardate 2715.1
diff -u isc-dhcp-4.2.2/debian/dhclient-script.linux
isc-dhcp-4.2.2/debian/dhclient-script.linux
--- isc-dhcp-4.2.2/debian/dhclient-script.linux
+++ isc-dhcp-4.2.2/debian/dhclient-script.linux
@@ -83,23 +83,6 @@
fi
}
-# set host name
-set_hostname() {
- local current_hostname
-
- if [ -n "$new_host_name" ]; then
- current_hostname=$(hostname)
-
- # current host name is empty, '(none)' or 'localhost' or differs from
new one from DHCP
- if [ -z "$current_hostname" ] ||
- [ "$current_hostname" = '(none)' ] ||
- [ "$current_hostname" = 'localhost' ] ||
- [ "$new_host_name" != "$current_hostname" ]; then
- hostname "$new_host_name"
- fi
- fi
-}
-
# run given script
run_hook() {
local script
@@ -193,8 +176,6 @@
;;
BOUND|RENEW|REBIND|REBOOT)
- set_hostname
-
if [ -n "$old_ip_address" ] && [ -n "$alias_ip_address" ] &&
[ "$alias_ip_address" != "$old_ip_address" ]; then
# alias IP may have changed => flush it
diff -u isc-dhcp-4.2.2/debian/changelog isc-dhcp-4.2.2/debian/changelog
--- isc-dhcp-4.2.2/debian/changelog
+++ isc-dhcp-4.2.2/debian/changelog
@@ -1,3 +1,10 @@
+isc-dhcp (4.2.2-1.1) UNRELEASED; urgency=low
+
+ * Non-maintainer upload.
+ * Don't even try to set the hostname. (closes: #648676)
+
+ -- Bastian Blank <wa...@debian.org> Wed, 04 Jan 2012 19:06:48 +0100
+
isc-dhcp (4.2.2-1) unstable; urgency=low
* New upstream release, includes security fixes for CVE-2011-2748 and
