← Back to branch summary

~cyphermox/ubuntu/precise/dnsmasq/dbus

« back to all changes in this revision

Viewing changes to debian/init

  • Committer: Bazaar Package Importer
  • Author(s): Simon Kelley
  • Date: 2005-09-03 20:02:32 UTC
  • mfrom: (0.2.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20050903200232-76u3kbiz1hm4ok3u
Tags: 2.24-1
http://bugs.debian.org/330422
http://bugs.debian.org/326057
http://bugs.debian.org/304446
http://bugs.debian.org/336413
http://bugs.debian.org/338353
 * New upstream. (closes: #330422)
 * Fix typo and clean up dnsmasq.conf (closes: #326057) (closes: #304446)
 * Add build support for I18N and gettext.
 * Fixed manpage typos. (closes: #336413)
 * Create a dnsmasq-unique userid for the daemon to run as. (closes: #338353)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/init
37
37
        DNSMASQ_INTERFACES="$DNSMASQ_INTERFACES -i $INTERFACE"
38
38
done
39
39
 
 
40
for INTERFACE in $DNSMASQ_EXCEPT; do
 
41
        DNSMASQ_INTERFACES="$DNSMASQ_INTERFACES -I $INTERFACE"
 
42
done
 
43
 
 
44
if [ ! "$DNSMASQ_USER" ]; then
 
45
   DNSMASQ_USER="dnsmasq"
 
46
fi
 
47
 
40
48
start()
41
49
{
42
50
        # Return
59
67
 
60
68
start_resolvconf()
61
69
{
62
 
        if [ -x /sbin/resolvconf ] ; then
 
70
# If interface "lo" is explicitly disabled in /etc/default/dnsmasq
 
71
# Then dnsmasq won't be providing local DNS, so don't add it to
 
72
# the resolvconf server set.
 
73
        for interface in $DNSMASQ_EXCEPT
 
74
        do
 
75
                [ $interface = lo ] && return
 
76
        done
 
77
 
 
78
        if [ -x /sbin/resolvconf ] ; then
63
79
                echo "nameserver 127.0.0.1" | /sbin/resolvconf -a lo.$NAME
64
80
        fi
65
81
        return 0