diff options
| author | intrigeri <intrigeri@boum.org> | 2016-08-25 15:32:55 +0000 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2016-08-25 15:32:55 +0000 |
| commit | f86ecd2b627954f5cad1d0569d790a43305ce1ad (patch) | |
| tree | 15e2d41646dd340b4a0ccd0882d538efd2b476a6 | |
| parent | 15bf218315457f2061af691a7b4b6f919098af2e (diff) | |
Drop custom NetworkManager plugin configuration: these tweaks are not needed on Stretch anymore.wip/feature/stretch-no-dhclient
| -rw-r--r-- | config/chroot_local-includes/etc/NetworkManager/conf.d/plugins.conf | 2 | ||||
| -rw-r--r-- | wiki/src/contribute/design.mdwn | 17 |
2 files changed, 2 insertions, 17 deletions
diff --git a/config/chroot_local-includes/etc/NetworkManager/conf.d/plugins.conf b/config/chroot_local-includes/etc/NetworkManager/conf.d/plugins.conf deleted file mode 100644 index c37b596..0000000 --- a/config/chroot_local-includes/etc/NetworkManager/conf.d/plugins.conf +++ /dev/null @@ -1,2 +0,0 @@ -[main] -plugins=keyfile diff --git a/wiki/src/contribute/design.mdwn b/wiki/src/contribute/design.mdwn index 22a8912..37fcccc 100644 --- a/wiki/src/contribute/design.mdwn +++ b/wiki/src/contribute/design.mdwn @@ -1173,30 +1173,17 @@ encrypt and decrypt text, and to verify OpenPGP signatures. Tails prevents dhclient from sending the hostname over the network. -First, only the `keyfile` NetworkManager plugin is used; that is, the -`ifupdown` plugin is disabled: - -* this is needed, because the only the `keyfile` plugin supports - setting `dhcp-send-hostname` to false, while the `ifupdown` plugin - retrieves the hostname to send from `/etc/hostname`; -* this is OK, because we actually don't use the functionality provided - by the `ifupdown` plugin (that is, reading from - `/etc/network/interfaces` -- that only configures the loopback - connection in Tails, which is itself ignored by NetworkManager - anyway). - -Second, NetworkManager is configured to *not* +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 is told to override any hostname provided by the DHCP +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-includes/etc/NetworkManager/conf.d/dhcp-hostname.conf]] -* [[!tails_gitweb config/chroot_local-includes/etc/NetworkManager/conf.d/plugins.conf]] ### 3.6.24 TCP timestamps |