diff options
| author | Kali Kaneko <kali@leap.se> | 2013-09-12 14:29:32 +0200 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2013-09-12 14:29:32 +0200 |
| commit | b1a2ec9a672d6f097d56d039d164918508f72ceb (patch) | |
| tree | 0e259ada6c41b5e660f2e64188238acf4594f140 /pkg/linux/resolv-update | |
| parent | 4951157e3740b42ecef6775c8927b912a6ee8870 (diff) | |
| parent | 9568093138c85212e15d50ade5d5fc7dcec9ff6e (diff) | |
Merge branch 'master' into debian
Conflicts:
pkg/requirements.pip
setup.py
Diffstat (limited to 'pkg/linux/resolv-update')
| -rwxr-xr-x | pkg/linux/resolv-update | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/linux/resolv-update b/pkg/linux/resolv-update index a54802e3..601d3bd2 100755 --- a/pkg/linux/resolv-update +++ b/pkg/linux/resolv-update @@ -20,13 +20,13 @@ function up() { comment=$( cat <<SETVAR # -# This is a temporary resolv.conf set by the LEAP Client in order to +# This is a temporary resolv.conf set by the Bitmask in order to # strictly enforce that DNS lookups are secured by the VPN. # -# When the LEAP Client quits or the VPN connection it manages is dropped, +# When Bitmask quits or the VPN connection it manages is dropped, # this file will be replace with the regularly scheduled /etc/resolv.conf # -# If you want custom entries to appear in this file while LEAP is running, +# If you want custom entries to appear in this file while Bitmask is running, # put them in /etc/leap/resolv-head or /etc/leap/resolv-tail. These files # should only be writable by root. # |