Changeset 14126


Ignorieren:
Zeitstempel:
08.03.2017 23:47:53 (vor 5 Monaten)
Autor:
er13
Nachricht:

rc.multid:

  • consider dnsmasq port while checking if dnsmasq dns-service is enabled, setting dns-port to 0 means disable dns-service (s. man page for more details)
  • based on patch from dirkh provided in #2887
  • refs #2887
Datei:
1 bearbeitet

Legende:

Unverändert
Hinzugefügt
Entfernt
  • trunk/make/mod/files/root/etc/init.d/rc.multid

    r13038 r14126  
    6262        local _bind_enabled="$(modconf value BIND_ENABLED bind 2>/dev/null)" 
    6363        local _dnsmasq_enabled="$(modconf value DNSMASQ_ENABLED dnsmasq 2>/dev/null)" 
    64         if [ "$_resolv_conf_dns" == "127.0.0.1" -a "$_bind_enabled" != yes -a "$_dnsmasq_enabled" != yes ]; then 
     64        local _dnsmasq_port="$(modconf value DNSMASQ_DNS_PORT dnsmasq 2>/dev/null)" 
     65        local _dnsmasq_dns_enabled=$([ "$_dnsmasq_enabled" = yes -a "$_dnsmasq_port" -gt 0 ] 2>/dev/null && echo yes || echo no) 
     66        if [ "$_resolv_conf_dns" == "127.0.0.1" -a "$_bind_enabled" != yes -a "$_dnsmasq_dns_enabled" != yes ]; then 
    6567            echo -n "discarded libmultid, no enabled dns server ... " 
    6668        else 
Hinweis: Hilfe zur Verwendung der Changeset-Ansicht finden Sie unter TracChangeset.