# HG changeset patch # User Pascal Bellard # Date 1385725400 0 # Node ID 8ebec64e419176264a91974e43829c7e8bedc0f2 # Parent 02e59bb0cae135d17ccd2c19c9004bf0fbf7c284 Update some start scripts diff -r 02e59bb0cae1 -r 8ebec64e4191 connman/stuff/etc/init.d/connman --- a/connman/stuff/etc/init.d/connman Fri Nov 29 08:51:47 2013 +0000 +++ b/connman/stuff/etc/init.d/connman Fri Nov 29 11:43:20 2013 +0000 @@ -17,33 +17,32 @@ case "$1" in start) - if [ -d $PIDFILE ] ; then + if active_pidfile $PIDFILE connmand ; then echo "$NAME already running." exit 1 fi - killall udhcpc 2>/dev/null + killall udhcpc 2>/dev/null echo -n "Starting $DESC: $NAME... " $DAEMON $OPTIONS status ;; stop) - if [ -z "$(pidof connmand)" ] ; then + if ! active_pidfile $PIDFILE connmand ; then echo "$NAME is not running." - rm -rf $PIDFILE exit 1 fi echo -n "Stopping $DESC: $NAME... " - rm -rf $PIDFILE - kill $(pidof connmand) - status + rm -rf $PIDFILE + kill $(pidof connmand) + status ;; restart) - if [ -z "$(pidof connmand)" ]; then + if ! active_pidfile $PIDFILE connmand ; then echo "$NAME is not running." exit 1 fi echo -n "Restarting $DESC: $NAME... " - rm -rf $PIDFILE + rm -rf $PIDFILE kill $(pidof connmand) && sleep 2 && $DAEMON $OPTIONS diff -r 02e59bb0cae1 -r 8ebec64e4191 cups/stuff/etc/init.d/cupsd --- a/cups/stuff/etc/init.d/cupsd Fri Nov 29 08:51:47 2013 +0000 +++ b/cups/stuff/etc/init.d/cupsd Fri Nov 29 11:43:20 2013 +0000 @@ -23,8 +23,7 @@ status ;; start) - pgrep -f cupsd > /dev/null || rm -f $PIDFILE 2> /dev/null - if [ ! -e $PIDFILE ]; then + if ! active_pidfile $PIDFILE cupsd ; then echo -n "Starting $DESC: $NAME... " $DAEMON $OPTIONS status diff -r 02e59bb0cae1 -r 8ebec64e4191 gpm/stuff/etc/init.d/gpm --- a/gpm/stuff/etc/init.d/gpm Fri Nov 29 08:51:47 2013 +0000 +++ b/gpm/stuff/etc/init.d/gpm Fri Nov 29 11:43:20 2013 +0000 @@ -16,14 +16,26 @@ case "$1" in start) + if active_pidfile $PIDFILE gpm ; then + echo "$NAME already running." + exit 1 + fi $DAEMON $OPTIONS status ;; stop) + if ! active_pidfile $PIDFILE gpm ; then + echo "$NAME is not running." + exit 1 + fi $DAEMON -k status ;; restart) + if ! active_pidfile $PIDFILE gpm ; then + echo "$NAME is not running." + exit 1 + fi $DAEMON -k status $DAEMON $OPTIONS diff -r 02e59bb0cae1 -r 8ebec64e4191 hostapd/stuff/hostapd --- a/hostapd/stuff/hostapd Fri Nov 29 08:51:47 2013 +0000 +++ b/hostapd/stuff/hostapd Fri Nov 29 11:43:20 2013 +0000 @@ -14,7 +14,7 @@ case "$1" in start) - if [ -f $PIDFILE ] ; then + if active_pidfile $PIDFILE hostapd ; then echo "$NAME already running." exit 1 fi @@ -23,7 +23,7 @@ status ;; stop) - if [ ! -f $PIDFILE ] ; then + if ! active_pidfile $PIDFILE hostapd ; then echo "$NAME is not running." exit 1 fi @@ -32,7 +32,7 @@ status ;; restart) - if [ ! -f $PIDFILE ] ; then + if ! active_pidfile $PIDFILE hostapd ; then echo "$NAME is not running." exit 1 fi diff -r 02e59bb0cae1 -r 8ebec64e4191 lighttpd-modules/receipt --- a/lighttpd-modules/receipt Fri Nov 29 08:51:47 2013 +0000 +++ b/lighttpd-modules/receipt Fri Nov 29 11:43:20 2013 +0000 @@ -28,7 +28,7 @@ { # Modules. mkdir -p $fs/usr/ - cp -a $_pkg/usr/lib $fs/usr + cp -a $install/usr/lib $fs/usr for module in $BASE_MODULES do rm -f $fs/usr/lib/lighttpd/mod_${module}.so diff -r 02e59bb0cae1 -r 8ebec64e4191 lighttpd/receipt --- a/lighttpd/receipt Fri Nov 29 08:51:47 2013 +0000 +++ b/lighttpd/receipt Fri Nov 29 11:43:20 2013 +0000 @@ -31,19 +31,15 @@ { cd $src sed -i '/addrs_left/d' src/mod_extforward.c - if [ ! done.fastcgi_detach.patch ]; then - patch -i $stuff/fastcgi_detach.patch || return 1 - touch done.fastcgi_detach.patch - fi ./configure \ --enable-shared \ --disable-ipv6 \ --prefix=/usr \ - --libdir=/usr/lib/lighttpd \ - --mandir=/usr/share/man \ - $CONFIGURE_ARGS && + --libdir=/usr/lib/lighttpd \ + --mandir=/usr/share/man \ + $CONFIGURE_ARGS && make && - make DESTDIR=$PWD/_pkg install + make DESTDIR=$DESTDIR install } # Rules to gen a SliTaz package suitable for Tazpkg. @@ -51,14 +47,14 @@ genpkg_rules() { mkdir -p $fs/usr - #cp -a $_pkg/usr/bin $fs/usr - cp -a $_pkg/usr/sbin $fs/usr + #cp -a $install/usr/bin $fs/usr + cp -a $install/usr/sbin $fs/usr # Modules. mkdir -p $fs/usr/lib/lighttpd for module in $BASE_MODULES do - cp $_pkg/usr/lib/lighttpd/mod_${module}.so $fs/usr/lib/lighttpd + cp $install/usr/lib/lighttpd/mod_${module}.so $fs/usr/lib/lighttpd echo -n "Copying : mod_${module}.so" && status done diff -r 02e59bb0cae1 -r 8ebec64e4191 mpd/stuff/etc/init.d/mpd --- a/mpd/stuff/etc/init.d/mpd Fri Nov 29 08:51:47 2013 +0000 +++ b/mpd/stuff/etc/init.d/mpd Fri Nov 29 11:43:20 2013 +0000 @@ -11,21 +11,35 @@ DESC="Music Player Daemon" DAEMON=/usr/sbin/mpd OPTION="/etc/mpd.conf" +PIDFILE="/var/run/mpd.pid" case "$1" in start) + if active_pidfile $PIDFILE mpd ; then + echo "$NAME already running." + exit 1 + fi echo -n "Starting $DESC: $NAME... " $DAEMON $OPTION 2> /dev/null status + pidof $NAME > $PIDFILE ;; stop) + if ! active_pidfile $PIDFILE mpd ; then + echo "$NAME is not running." + exit 1 + fi echo -n "Stopping $DESC: $NAME... " - $DAEMON --kill 2> /dev/null + kill $(pidof $NAME) status ;; restart) + if ! active_pidfile $PIDFILE mpd ; then + echo "$NAME is not running." + exit 1 + fi echo -n "Restarting $DESC: $NAME... " - $DAEMON --kill 2> /dev/null + kill $(pidof $NAME) sleep 2 $DAEMON $OPTION 2> /dev/null status diff -r 02e59bb0cae1 -r 8ebec64e4191 ofono/receipt --- a/ofono/receipt Fri Nov 29 08:51:47 2013 +0000 +++ b/ofono/receipt Fri Nov 29 11:43:20 2013 +0000 @@ -5,11 +5,12 @@ CATEGORY="network" SHORT_DESC="Stack for mobile telephony (GSM/UMTS) applications." MAINTAINER="slaxemulator@gmail.com" +LICENSE="GPL2" TARBALL="$PACKAGE-$VERSION.tar.xz" WEB_SITE="http://ofono.org" WGET_URL="http://linux-kernel.uio.no/pub/linux/network/$PACKAGE/$TARBALL" -DEPENDS="dbus glib udev" +DEPENDS="dbus glib udev bluez" BUILD_DEPENDS="dbus-dev udev-dev glib-dev bluez-dev \ mobile-broadband-provider-info-dev" @@ -23,7 +24,7 @@ --infodir=/usr/share/info \ --mandir=/usr/share/man \ $CONFIGURE_ARGS && - make && make DESTDIR=$PWD/_pkg install + make && make DESTDIR=$DESTDIR install } # Rules to gen a SliTaz package suitable for Tazpkg. @@ -31,8 +32,9 @@ { # sysconfdir mkdir -p $fs/etc - cp -a $_pkg/etc/* $fs/etc + cp -a $install/etc/* $fs/etc + cp -a $stuff/etc/* $fs/etc # sbin mkdir -p $fs/usr - cp -a $_pkg/usr/sbin $fs/usr + cp -a $install/usr/sbin $fs/usr } diff -r 02e59bb0cae1 -r 8ebec64e4191 ofono/stuff/etc/init.d/ofono --- a/ofono/stuff/etc/init.d/ofono Fri Nov 29 08:51:47 2013 +0000 +++ b/ofono/stuff/etc/init.d/ofono Fri Nov 29 11:43:20 2013 +0000 @@ -13,43 +13,43 @@ DESC="Mobile telephony Manager" DAEMON=/usr/sbin/ofonod OPTIONS=$OFONO_OPTIONS -PIDFILE=/run/ofono +PIDFILE=/var/run/ofono.pid case "$1" in start) - if [ -d $PIDFILE ] ; then + if active_pidfile $PIDFILE ofonod ; then echo "$NAME already running." exit 1 fi echo -n "Starting $DESC: $NAME... " $DAEMON $OPTIONS status + pidof ofonod > $PIDFILE ;; stop) - if [ -z "$(pidof ofonod)" ] ; then + if ! active_pidfile $PIDFILE ofonod ; then echo "$NAME is not running." - rm -rf $PIDFILE exit 1 fi echo -n "Stopping $DESC: $NAME... " - rm -rf $PIDFILE - kill $(pidof ofonod) - status + rm -rf $PIDFILE + kill $(pidof ofonod) + status ;; restart) - if [ -z "$(pidof ofonod)" ]; then + if ! active_pidfile $PIDFILE ofonod ; then echo "$NAME is not running." exit 1 fi echo -n "Restarting $DESC: $NAME... " - rm -rf $PIDFILE + rm -rf $PIDFILE kill $(pidof ofonod) && sleep 2 && $DAEMON $OPTIONS status ;; *) - printf "\n\033[1mUsage:\033[0m /etc/init.d/%b [start|stop|restart]\n" \ + printf "\n\033[1mUsage:\033[0m /etc/init.d/%b [start|stop|restart]\n" \ "$(basename $0)" exit 1 ;; diff -r 02e59bb0cae1 -r 8ebec64e4191 wicd/stuff/wicd --- a/wicd/stuff/wicd Fri Nov 29 08:51:47 2013 +0000 +++ b/wicd/stuff/wicd Fri Nov 29 11:43:20 2013 +0000 @@ -16,7 +16,7 @@ case "$1" in start) - if [ -f $PIDFILE ] ; then + if active_pidfile $PIDFILE wicd ; then echo "$NAME already running." exit 1 fi @@ -25,7 +25,7 @@ status ;; stop) - if [ ! -f $PIDFILE ] ; then + if ! active_pidfile $PIDFILE wicd ; then echo "$NAME is not running." exit 1 fi @@ -35,7 +35,7 @@ status ;; restart) - if [ ! -f $PIDFILE ] ; then + if ! active_pidfile $PIDFILE wicd ; then echo "$NAME is not running." exit 1 fi