diff options
| author | Sebastien Estienne <sebastien.estienne@gmail.com> | 2006-02-03 22:04:13 +0000 |
|---|---|---|
| committer | Sebastien Estienne <sebastien.estienne@gmail.com> | 2006-02-03 22:04:13 +0000 |
| commit | 5bf66ba8d479bbe613da1b9557b8aad2c448b536 (patch) | |
| tree | bcca664fc331a36434d8529fbbd27a73189f3247 | |
| parent | f386380ed985f6a720195e9a7075e3fe912ea9b2 (diff) | |
* add support for /etc/localtime in avahi's chroot for debian
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1128 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
| -rw-r--r-- | initscript/debian/Makefile.am | 10 | ||||
| -rwxr-xr-x | initscript/debian/avahi-daemon.in | 7 | ||||
| -rwxr-xr-x | initscript/debian/avahi-dnsconfd.in | 7 |
3 files changed, 22 insertions, 2 deletions
diff --git a/initscript/debian/Makefile.am b/initscript/debian/Makefile.am index 4165ad3..7991ea6 100644 --- a/initscript/debian/Makefile.am +++ b/initscript/debian/Makefile.am @@ -32,9 +32,15 @@ CLEANFILES = \ avahi-dnsconfd avahi-daemon: avahi-daemon.in - sed -e 's,@sbindir\@,$(sbindir),g' $< > $@ + sed \ + -e 's,@sbindir\@,$(sbindir),g' \ + -e 's,@sysconfdir\@,$(sysconfdir),g' \ + $< > $@ chmod +x $@ avahi-dnsconfd: avahi-dnsconfd.in - sed -e 's,@sbindir\@,$(sbindir),g' $< > $@ + sed \ + -e 's,@sbindir\@,$(sbindir),g' \ + -e 's,@sysconfdir\@,$(sysconfdir),g' \ + $< > $@ chmod +x $@ diff --git a/initscript/debian/avahi-daemon.in b/initscript/debian/avahi-daemon.in index ddaeba4..feecc84 100755 --- a/initscript/debian/avahi-daemon.in +++ b/initscript/debian/avahi-daemon.in @@ -91,6 +91,13 @@ test -x $DAEMON || exit 0 # Function that starts the daemon/service. # d_start() { + if [ -s /etc/localtime ]; then + if [ ! -d /etc/avahi/etc ]; then + mkdir -p @sysconfdir@/avahi/etc >/dev/null 2>&1 + fi + cp -fp /etc/localtime @sysconfdir@/avahi/etc >/dev/null 2>&1 + fi; + $DAEMON -D } diff --git a/initscript/debian/avahi-dnsconfd.in b/initscript/debian/avahi-dnsconfd.in index 0720a9e..649d72f 100755 --- a/initscript/debian/avahi-dnsconfd.in +++ b/initscript/debian/avahi-dnsconfd.in @@ -91,6 +91,13 @@ test -x $DAEMON || exit 0 # Function that starts the daemon/service. # d_start() { + if [ -s /etc/localtime ]; then + if [ ! -d /etc/avahi/etc ]; then + mkdir -p @sysconfdir@/avahi/etc >/dev/null 2>&1 + fi + cp -fp /etc/localtime @sysconfdir@/avahi/etc >/dev/null 2>&1 + fi; + $DAEMON -D } |