Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=openjava.git;a=commitdiff;h=5cf4e95e1c08d0ee32a60a8a00886ba6c32687ba
commit 5cf4e95e1c08d0ee32a60a8a00886ba6c32687ba Author: James Buren <[email protected]> Date: Fri Jun 8 20:54:13 2012 -0500 nanny-2.31.1-2-x86_64 * remove sysvinit as it doesn't even work anymore. diff --git a/source/gnome-extra/nanny/FrugalBuild b/source/gnome-extra/nanny/FrugalBuild index f572911..388b189 100644 --- a/source/gnome-extra/nanny/FrugalBuild +++ b/source/gnome-extra/nanny/FrugalBuild @@ -3,7 +3,7 @@ pkgname=nanny pkgver=2.31.1 -pkgrel=1 +pkgrel=2 pkgdesc="Gnome Parental Control" depends=('pygtk' 'twisted' 'dbus-python' 'imaging' 'hachoir-regex' \ 'gnome-desktop>=2.29.0' 'rarian' 'gnome-python-desktop-gtop') @@ -17,16 +17,13 @@ _F_gnome_scrollkeeper="y" _F_gnome_devel="y" backup=('etc/sysconfig/nanny') Finclude gnome gnome-scriptlet -source=($source rc.nanny) -sha1sums=('95bc9f23fc661a5408c91fa3db3183c8a264dce3' \ - '4c5a1c5a8bcfcd8537da78a3df9b0b560de383c2') +sha1sums=('95bc9f23fc661a5408c91fa3db3183c8a264dce3') build() { Fcd Fsed "admin" "root" daemon/data/dbus/nanny-daemon.conf Fbuild Fbuild_gnome_scriptlet - Frcd2 nanny } # optimization OK diff --git a/source/gnome-extra/nanny/rc.nanny b/source/gnome-extra/nanny/rc.nanny deleted file mode 100644 index 5aef7f3..0000000 --- a/source/gnome-extra/nanny/rc.nanny +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/bash - -# (c) 2010 bouleetbil <[email protected]> -# rc.nanny for FrugalWare -# distributed under GPL License - -# chkconfig: 2345 99 50 -# description: Gnome Parental Control - -source /lib/initscripts/functions -TEXTDOMAIN=nanny -TEXTDOMAINDIR=/lib/initscripts/messages -daemon="nanny" - -actions=(restart start status stop) - -NANNY_TAP="/usr/share/nanny/daemon/nanny.tap" -PID_FILE="/var/run/nanny/NannyDaemon.pid" -LOG_FILE="/var/log/nanny.log" - -TWISTD=$(which twistd) -DAEMON="$TWISTD --pidfile $PID_FILE -r glib2 --logfile $LOG_FILE -y $NANNY_TAP --" - -# Include nanny defaults if available -if [ -f /etc/sysconfig/nanny ] ; then - . /etc/sysconfig/nanny -fi - - -rc_start() -{ - start_msg - mkdir -p /var/run/nanny - if [ ! -f $PID_FILE ]; then - $DAEMON 2>/dev/null 1>/dev/null - ok $? - else - ok 999 - fi -} - -rc_stop() -{ - stop_msg - if [ -f $PID_FILE ] ;then - kill $(eval ps aux | grep $LOG_FILE | awk '{ print $2 }' | head -1) - rm -rf $PID_FILE - ok $? - else - ok 999 - fi -} - -rc_exec $1 - _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
