Commit d09c3f18 authored by intrigeri's avatar intrigeri

Replace resolvconf with simpler NetworkManager and dhclient configuration.

Refs: #7708
parent ebac17a6
#!/bin/sh
set -e
echo "Removing traces of the nameservers used when building"
rm /etc/resolvconf/resolv.conf.d/original
......@@ -14,7 +14,6 @@ i2p
kexec-load
laptop-mode
memlockd
resolvconf
saned
spice-vdagent
tor
......
#!/bin/sh
set -e
echo "Removing resolv.conf symbolic link"
rm /etc/resolv.conf
#!/bin/sh
Configure_resolv_conf ()
{
echo -n " resolv-conf"
rm -f /etc/resolv.conf
ln -s /etc/resolvconf/run/resolv.conf /etc/resolv.conf
# Creating state file
touch /var/lib/live/config/resolv-conf
}
Configure_resolv_conf
......@@ -195,7 +195,6 @@ pulseaudio
pulseaudio-utils
pwgen
p7zip-full
resolvconf
rfkill
sane-utils
scdaemon
......
Tails specific: no need to stop properly on shutdown, we are amnesic.
--- chroot.orig/etc/init.d/resolvconf 2012-09-24 10:05:13.285055205 +0200
+++ chroot/etc/init.d/resolvconf 2012-09-24 10:47:23.717869294 +0200
@@ -9,1 +9,1 @@
-# Default-Stop: 0 6
+# Default-Stop:
......@@ -19,9 +19,13 @@ An exception to the above DNS configuration is the `clearnet` user
used to run the [[contribute/design/Unsafe_Browser]], which uses the
DNS server provided for DHCP for resolving.
[resolvconf](http://alioth.debian.org/projects/resolvconf/) is used to
configure the system resolver in `/etc/resolv.conf`; it is also set up
to prevent NetworkManager and dhcp-client to modify this file.
`resolv.conf` is configured to point to the Tor DNS resolver, and <span
class="application">NetworkManager<span> and `dhclient` are configured
not to manage `resolv.conf` at all:
* [[!tails_gitweb config/chroot_local-includes/etc/resolv.conf]]
* [[!tails_gitweb config/chroot_local-includes/etc/NetworkManager/conf.d/dns.conf]]
* [[!tails_gitweb config/chroot_local-includes/etc/dhcp/dhclient-enter-hooks.d/disable_make_resolv_conf]]
Since the Tor DNS resolver lacks support for most types of DNS queries
except "A", [ttdnsd](https://www.torproject.org/ttdnsd/) is also
......@@ -37,9 +41,6 @@ considered, but doing so would give too much power to a single
third-party, that is to the organization or people that runs the
recursive DNS resolver ttdnsd is configured to use.
- [[!tails_gitweb config/chroot_local-includes/etc/resolvconf/resolv.conf.d/base]]
- [[!tails_gitweb config/chroot_local-includes/etc/tor/torrc]]
- [[!tails_gitweb config/chroot_local-includes/etc/firewall.conf]]
- [[!tails_gitweb config/chroot_local-includes/lib/live/config/000-resolv-conf]]
- [[!tails_gitweb config/chroot_local-hooks/99-zzz_resolvconf]]
- [[!tails_gitweb config/chroot_local-includes/etc/default/ttdnsd]]
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment