← Back to branch summary

~cyphermox/ubuntu/vivid/ppp/merge-2.4.6

« back to all changes in this revision

Viewing changes to extra/ppp-udeb.ip-up

  • Committer: Mathieu Trudel-Lapierre
  • Date: 2014-11-05 05:35:43 UTC
  • mfrom: (2.1.16 sid)
  • Revision ID: mathieu-tl@ubuntu.com-20141105053543-pwkdzpn4zae420uw
* Merge with Debian unstable; remaining changes:
  - debian/patches/load_ppp_generic_if_needed: load ppp_generic kernel
    module if needed.
  - add EAP-TLS/MPPE support patch from Jan Just Keijser.
  - debian/control: add libssl-dev to Build-Depends for the EAP-TLS patch.
* debian/patches/ppp-2.4.5-eaptls-mppe-0.994.patch,
  debian/patches/ppp-2.4.6-eaptls-mppe-0.997.patch: updated the EAP-TLS/MPPE
  support patch to the latest version from its upstream (also refreshed it).
* debian/ppp.preinst: deal with the change in LSB headers start runlevels
  of pppd-dns due to dropping our changes (which are no longer necessary
  since resolvconf is installed in most systems and has been for a while);
  this should probably be kept until the next LTS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
extra/ppp-udeb.ip-up
1
 
#!/bin/sh
2
 
# adds the DNS servers got via ppp to the global resolv.conf
3
 
# License: GPL
4
 
# Copyright Eddy Petrișor <eddy.petrisor@gmail.com> 2006
5
 
 
6
 
umask 0022 # normally ran by pppd with 0077
7
 
: >> /etc/resolv.conf
8
 
MARK='added by D-I (pppd)'
9
 
cp /etc/resolv.conf /tmp/resolv.conf.tmp
10
 
sed "/#$MARK/d" /tmp/resolv.conf.tmp > /etc/resolv.conf
11
 
rm -f /tmp/resolv.conf.tmp
12
 
[ "$DNS1" ] && echo "nameserver $DNS1 #$MARK" >> /etc/resolv.conf
13
 
[ "$DNS2" ] && echo "nameserver $DNS2 #$MARK" >> /etc/resolv.conf