summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2016-08-26 12:13:56 +0000
committerintrigeri <intrigeri@boum.org>2016-08-26 15:27:01 +0000
commita0158d97fc2260df8e6b1b67235f2eea914f6a81 (patch)
tree40033ae605dc21f294004f3d35962e9a5f06ab96
parent0279c47924311bff09e8ea4c29ed7ff5c1ab7f0c (diff)
Drop obsolete NM configuration wrt. sending hostname in DHCP requests, and update design doc to reflect what is really happening in Tails 3.x.
Closes: #11720
-rw-r--r--config/chroot_local-includes/etc/NetworkManager/conf.d/dhcp-hostname.conf2
-rw-r--r--wiki/src/contribute/design.mdwn10
2 files changed, 4 insertions, 8 deletions
diff --git a/config/chroot_local-includes/etc/NetworkManager/conf.d/dhcp-hostname.conf b/config/chroot_local-includes/etc/NetworkManager/conf.d/dhcp-hostname.conf
deleted file mode 100644
index 784ff8d..0000000
--- a/config/chroot_local-includes/etc/NetworkManager/conf.d/dhcp-hostname.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[ipv4]
-dhcp-send-hostname=false
diff --git a/wiki/src/contribute/design.mdwn b/wiki/src/contribute/design.mdwn
index de3e211..c729805 100644
--- a/wiki/src/contribute/design.mdwn
+++ b/wiki/src/contribute/design.mdwn
@@ -1173,12 +1173,10 @@ encrypt and decrypt text, and to verify OpenPGP signatures.
Tails prevents dhclient from sending the hostname over the network.
-NetworkManager is configured to *not*
-send the hostname over DHCP by default, and the pre-existing wired
-connection is configured this way. This can be overridden
-on a per-connection basis if one really needs to change this.
+We patch NetworkManager to make it never instruct dhclient to send the
+hostname in DHCP requests, until [[!gnomebug 768076]] is fixed.
-dhclient itself is told not to send the hostname. This is
+Also, dhclient itself is told not to send the hostname. This is
needed because on Jessie, NetworkManager runs dhclient with the `-cf
/var/lib/NetworkManager/dhclient-$UUID-eth0.conf` option, and generates that file by
concatenating `/etc/dhcp/dhclient.conf` with its own settings.
@@ -1188,8 +1186,8 @@ server with `amnesia`. This is meant to prevent dhclient hooks,
NetworkManager and others from setting the hostname to a value
controlled by the DHCP server.
+* [[!tails_gitweb_repo network-manager]]
* [[!tails_gitweb config/chroot_local-patches/dhcp-dont-send-hostname.diff]]
-* [[!tails_gitweb config/chroot_local-includes/etc/NetworkManager/conf.d/dhcp-hostname.conf]]
### 3.6.24 TCP timestamps