Date: Sunday, February 24, 2013 @ 00:55:27
Author: dreisner
Revision: 178470
remove rc.d script
Modified:
dnsmasq/trunk/PKGBUILD
Deleted:
dnsmasq/trunk/dnsmasq.confd
dnsmasq/trunk/rc.dnsmasq
---------------+
PKGBUILD | 7 ------
dnsmasq.confd | 9 -------
rc.dnsmasq | 64 --------------------------------------------------------
3 files changed, 80 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-02-23 23:53:14 UTC (rev 178469)
+++ PKGBUILD 2013-02-23 23:55:27 UTC (rev 178470)
@@ -15,12 +15,8 @@
backup=('etc/dnsmasq.conf'
'etc/conf.d/dnsmasq')
source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz";
- 'dnsmasq.confd'
- 'rc.dnsmasq'
'dnsmasq.service')
md5sums=('a91534a5d6f053d5c80f67ef502afa34'
- '66479e99123faeab83ebaed709ef95b5'
- '819fbdf6440d710616e6df5f8ca9cdba'
'7ac45726cabef4145db40d758cc7fedf')
build() {
@@ -38,9 +34,6 @@
make BINDIR=/usr/bin PREFIX=/usr DESTDIR="$pkgdir" install
- install -Dm755 "$srcdir"/rc.dnsmasq "$pkgdir"/etc/rc.d/dnsmasq
- install -Dm644 "$srcdir"/dnsmasq.confd "$pkgdir/etc/conf.d/dnsmasq"
-
install -Dm644 "dbus/dnsmasq.conf" "$pkgdir"/etc/dbus-1/system.d/dnsmasq.conf
install -Dm644 "dnsmasq.conf.example" "$pkgdir"/etc/dnsmasq.conf
install -Dm644 "$srcdir/dnsmasq.service"
"$pkgdir"/usr/lib/systemd/system/dnsmasq.service
Deleted: dnsmasq.confd
===================================================================
--- dnsmasq.confd 2013-02-23 23:53:14 UTC (rev 178469)
+++ dnsmasq.confd 2013-02-23 23:55:27 UTC (rev 178470)
@@ -1,9 +0,0 @@
-#
-# runtime config for dnsmasq
-#
-
-# if unset, dnsmasq will run as nobody.
-DNSMASQ_USER=dnsmasq
-
-# other runtime options. treated as an array.
-DNSMASQ_OPTS=()
Deleted: rc.dnsmasq
===================================================================
--- rc.dnsmasq 2013-02-23 23:53:14 UTC (rev 178469)
+++ rc.dnsmasq 2013-02-23 23:55:27 UTC (rev 178470)
@@ -1,64 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/dnsmasq
-
-checkconfig() {
- local testout
-
- if ! testout=$(/usr/bin/dnsmasq --test 2>&1); then
- echo "$testout"
- return 1
- fi
-
- return 0
-}
-
-pidfile=/run/dnsmasq.pid
-if [[ -r $pidfile ]]; then
- read -r PID < "$pidfile"
- if [[ ! -d /proc/$PID ]]; then
- # stale pidfile
- unset PID
- rm -f "$pidfile"
- fi
-fi
-
-case $1 in
- start)
- stat_busy "Starting DNS/DHCP daemon"
- if [[ -z $PID ]] && checkconfig &&
- /usr/bin/dnsmasq "--user=${DNSMASQ_USER:-nobody}" \
- "--pid-file=$pidfile" \
- "${DNSMASQ_OPTS[@]}"; then
- add_daemon dnsmasq
- stat_done
- else
- stat_fail
- fi
- ;;
- stop)
- stat_busy "Stopping DNS/DHCP daemon"
- if [[ $PID ]] && kill "$PID" &> /dev/null; then
- # dnsmasq doesn't clean up after itself
- rm -f "$pidfile"
- rm_daemon dnsmasq
- stat_done
- else
- stat_fail
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- checkconfig)
- # diagnostics will be printed, with zero/non-zero exit
- /usr/bin/dnsmasq --test
- ;;
- *)
- echo "usage: $0 <start|stop|restart|checkconfig>"
-esac
-
