summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2016-08-25 15:31:44 +0000
committerintrigeri <intrigeri@boum.org>2016-08-25 15:31:44 +0000
commit15bf218315457f2061af691a7b4b6f919098af2e (patch)
tree9fa9adb57eaa7bbee83c9b16cb01bfd62edc06f8
parent5b49762d623a489c7a233c2ac169f017f5dd7681 (diff)
Start updating the design doc wrt. the move from isc-dhcp-client.
The bits about the keyfile plugin, and those about override the hostname provided by the DHCP server, remain to be checked and updated.
-rw-r--r--wiki/src/contribute/design.mdwn13
1 files changed, 4 insertions, 9 deletions
diff --git a/wiki/src/contribute/design.mdwn b/wiki/src/contribute/design.mdwn
index 9dfd864..22a8912 100644
--- a/wiki/src/contribute/design.mdwn
+++ b/wiki/src/contribute/design.mdwn
@@ -1185,21 +1185,16 @@ First, only the `keyfile` NetworkManager plugin is used; that is, the
connection in Tails, which is itself ignored by NetworkManager
anyway).
-Second, the NetworkManager `keyfile` plugin is configured to *not*
-send the hostname over DHCP by default. Likely this can be overridden
+Second, 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.
-Third, 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-eth0.conf` option, and generates that file by
-concatenating `/etc/dhcp/dhclient.conf` with its own settings.
-
-Fourth, dhclient is told to override any hostname provided by the DHCP
+Third, dhclient is told to override any hostname provided by the DHCP
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 config/chroot_local-patches/dhcp-dont-send-hostname.diff]]
* [[!tails_gitweb config/chroot_local-includes/etc/NetworkManager/conf.d/dhcp-hostname.conf]]
* [[!tails_gitweb config/chroot_local-includes/etc/NetworkManager/conf.d/plugins.conf]]