[Resolvconf-devel] Bug#318464: minor fix for /etc/resolvconf/update.d/dnscache

[Daniel Kahn Gillmor]

Package: resolvconf
Version: 1.35
Followup-For: Bug #318464


Here's a minor update for the dnscache script.  This change makes the
script work whether daemontools was compiled with the djb filesystem
layout (svc in /command ) or with the FHS layout (svc in /usr/bin).

Sorry that i missed this on the earlier version of the script.

Thanks for your work on this,

	--dkg


--- resolvconf-1.35/etc/resolvconf/update.d/dnscache	2006-03-08 12:03:13.000000000 -0500
+++ /etc/resolvconf/update.d/dnscache	2006-06-08 01:06:20.000000000 -0400
@@ -94,8 +94,10 @@
 
 for CACHE in $CACHES ; do
     cp "$TMPFILE"  "$CACHE/root/servers/@"
-    ## restart the cache if it's already running:
-    [ -x /command/svc ] && /command/svc -t "$CACHE"
+    ## restart the cache if it's already running (try both default locations of svc):
+    ( [ -x /command/svc ] && /command/svc -t "$CACHE" ) || \
+     ( [ -x /usr/bin/svc ] && /usr/bin/svc -t "$CACHE" )
+    fi
 done
 
 rm -f "$TMPFILE"



-- System Information:
Debian Release: testing/unstable
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.15-1-686
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)

Versions of packages resolvconf depends on:
ii  coreutils                     5.94-1     The GNU core utilities
ii  debconf [debconf-2.0]         1.5.1      Debian configuration management sy
ii  lsb-base                      3.1-8      Linux Standard Base 3.1 init scrip

resolvconf recommends no packages.

-- debconf information excluded