summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2016-08-25 15:32:55 +0000
committerintrigeri <intrigeri@boum.org>2016-08-25 19:08:31 +0000
commit53a9fb8b12ad56e50c75ad549d9bf279b4b969a9 (patch)
tree98961a5c4834e82b23901704a9f5e098d63e9145
parent99456b42d4e6eac8637bd2bd54c5bbe9d1b02fe0 (diff)
Drop custom NetworkManager plugin configuration: these tweaks are not needed on Stretch anymore.
-rw-r--r--config/chroot_local-includes/etc/NetworkManager/conf.d/plugins.conf2
-rw-r--r--wiki/src/contribute/design.mdwn24
2 files changed, 6 insertions, 20 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 9dfd864..de3e211 100644
--- a/wiki/src/contribute/design.mdwn
+++ b/wiki/src/contribute/design.mdwn
@@ -1173,35 +1173,23 @@ 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, the NetworkManager `keyfile` plugin is configured to *not*
-send the hostname over DHCP by default. Likely this can be overridden
+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
+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
+/var/lib/NetworkManager/dhclient-$UUID-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
+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]]
### 3.6.24 TCP timestamps