diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-09-03 16:47:08 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-09-03 16:47:08 -0300 |
| commit | a420f5c4c2a4eeb411175d086b339b620dba309d (patch) | |
| tree | aa810cc98c17cf30cad06226c22f8256c056430e /testing/ppp/ip-up.d.dns.sh | |
| parent | 0ec0464a32563349252dda85e9176a9475d6fc34 (diff) | |
| parent | 81de702a6fc79e430129a7d2b708d90f43ae5ba1 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/vdrift/PKGBUILD
community-testing/widelands/PKGBUILD
core/cracklib/PKGBUILD
core/systemd/PKGBUILD
extra/imagemagick/PKGBUILD
extra/mesa/PKGBUILD
multilib/lib32-glibc/PKGBUILD
testing/libreoffice/PKGBUILD
testing/mpfr/PKGBUILD
testing/systemd/PKGBUILD
testing/sysvinit/PKGBUILD
testing/yp-tools/PKGBUILD
Diffstat (limited to 'testing/ppp/ip-up.d.dns.sh')
| -rw-r--r-- | testing/ppp/ip-up.d.dns.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/testing/ppp/ip-up.d.dns.sh b/testing/ppp/ip-up.d.dns.sh new file mode 100644 index 000000000..f9df543a4 --- /dev/null +++ b/testing/ppp/ip-up.d.dns.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +if [ "$USEPEERDNS" = "1" -a -f /etc/ppp/resolv.conf ]; then + [ -e /etc/resolv.conf ] && mv /etc/resolv.conf /etc/resolv.conf.backup.${IFNAME} + mv /etc/ppp/resolv.conf /etc/resolv.conf + chmod 644 /etc/resolv.conf +fi |