Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
tails
tails
Commits
d09c3f18
Commit
d09c3f18
authored
Jul 08, 2015
by
intrigeri
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace resolvconf with simpler NetworkManager and dhclient configuration.
Refs:
#7708
parent
ebac17a6
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
10 additions
and
43 deletions
+10
-43
config/chroot_local-hooks/17-clean_up_resolvconf
config/chroot_local-hooks/17-clean_up_resolvconf
+0
-7
config/chroot_local-hooks/52-update-rc.d
config/chroot_local-hooks/52-update-rc.d
+0
-1
config/chroot_local-hooks/99-zzz_resolvconf
config/chroot_local-hooks/99-zzz_resolvconf
+0
-6
config/chroot_local-includes/etc/NetworkManager/conf.d/dns.conf
.../chroot_local-includes/etc/NetworkManager/conf.d/dns.conf
+2
-0
config/chroot_local-includes/etc/dhcp/dhclient-enter-hooks.d/disable_make_resolv_conf
.../etc/dhcp/dhclient-enter-hooks.d/disable_make_resolv_conf
+1
-0
config/chroot_local-includes/etc/resolv.conf
config/chroot_local-includes/etc/resolv.conf
+0
-0
config/chroot_local-includes/etc/resolvconf/interface-order
config/chroot_local-includes/etc/resolvconf/interface-order
+0
-1
config/chroot_local-includes/lib/live/config/0000-resolv-conf
...ig/chroot_local-includes/lib/live/config/0000-resolv-conf
+0
-14
config/chroot_local-packageslists/tails-common.list
config/chroot_local-packageslists/tails-common.list
+0
-1
config/chroot_local-patches/keep_resolvconf_on_shutdown.diff
config/chroot_local-patches/keep_resolvconf_on_shutdown.diff
+0
-7
wiki/src/contribute/design/Tor_enforcement/DNS.mdwn
wiki/src/contribute/design/Tor_enforcement/DNS.mdwn
+7
-6
No files found.
config/chroot_local-hooks/17-clean_up_resolvconf
deleted
100755 → 0
View file @
ebac17a6
#!/bin/sh
set
-e
echo
"Removing traces of the nameservers used when building"
rm
/etc/resolvconf/resolv.conf.d/original
config/chroot_local-hooks/52-update-rc.d
View file @
d09c3f18
...
...
@@ -14,7 +14,6 @@ i2p
kexec-load
laptop-mode
memlockd
resolvconf
saned
spice-vdagent
tor
...
...
config/chroot_local-hooks/99-zzz_resolvconf
deleted
100755 → 0
View file @
ebac17a6
#!/bin/sh
set
-e
echo
"Removing resolv.conf symbolic link"
rm
/etc/resolv.conf
config/chroot_local-includes/etc/NetworkManager/conf.d/dns.conf
0 → 100644
View file @
d09c3f18
[
main
]
dns
=
none
config/chroot_local-includes/etc/dhcp/dhclient-enter-hooks.d/disable_make_resolv_conf
0 → 100755
View file @
d09c3f18
make_resolv_conf() { : ; }
config/chroot_local-includes/etc/resolvconf
/resolv.conf.d/base
→
config/chroot_local-includes/etc/resolv
.
conf
View file @
d09c3f18
File moved
config/chroot_local-includes/etc/resolvconf/interface-order
deleted
100644 → 0
View file @
ebac17a6
# interface-order(5)
config/chroot_local-includes/lib/live/config/0000-resolv-conf
deleted
100755 → 0
View file @
ebac17a6
#!/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
config/chroot_local-packageslists/tails-common.list
View file @
d09c3f18
...
...
@@ -195,7 +195,6 @@ pulseaudio
pulseaudio-utils
pwgen
p7zip-full
resolvconf
rfkill
sane-utils
scdaemon
...
...
config/chroot_local-patches/keep_resolvconf_on_shutdown.diff
deleted
100644 → 0
View file @
ebac17a6
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:
wiki/src/contribute/design/Tor_enforcement/DNS.mdwn
View file @
d09c3f18
...
...
@@ -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]]
intrigeri
@intrigeri
mentioned in issue
#17075
·
May 14, 2020
mentioned in issue
#17075
mentioned in issue #17075
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment