OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 21-Jul-2003 14:08:36
Branch: HEAD Handle: 2003072113083402
Modified files:
openpkg-src/samba rc.samba samba.spec
openpkg-web news.txt
Log:
%status and pidfile handling
Summary:
Revision Changes Path
1.13 +24 -12 openpkg-src/samba/rc.samba
1.48 +1 -1 openpkg-src/samba/samba.spec
1.5686 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/samba/rc.samba
============================================================================
$ cvs diff -u -r1.12 -r1.13 rc.samba
--- openpkg-src/samba/rc.samba 19 Jul 2003 17:06:26 -0000 1.12
+++ openpkg-src/samba/rc.samba 21 Jul 2003 12:08:36 -0000 1.13
@@ -6,6 +6,28 @@
%config
samba_enable="$openpkg_rc_def"
+%common
+ samba_smbd_pidfile="@l_prefix@/var/samba/run/smbd.pid"
+ samba_nmbd_pidfile="@l_prefix@/var/samba/run/nmbd.pid"
+ samba_signal () {
+ [ -f $samba_smbd_pidfile ] \
+ && kill -$1 `cat $samba_smbd_pidfile`
+ local rc=$?
+
+ [ -f $samba_nmbd_pidfile ] \
+ && kill -$1 `cat $samba_nmbd_pidfile` \
+ && [ $rc -eq 0 ]
+ }
+
+%status -p 200 -u @l_susr@ -o
+ samba_usable="unknown"
+ samba_active="no"
+ rcService samba enable yes && \
+ samba_signal 0 && samba_active="yes"
+ echo "samba_enable=\"$samba_enable\""
+ echo "samba_usable=\"$samba_usable\""
+ echo "samba_active=\"$samba_active\""
+
%start -p 200 -u @l_susr@
rcService samba enable yes || exit 0
@l_prefix@/sbin/smbd -D
@@ -13,21 +35,11 @@
%stop -p 200 -u @l_susr@
rcService samba enable yes || exit 0
- if [ -f @l_prefix@/var/samba/run/smbd.pid ]; then
- kill -TERM `cat @l_prefix@/var/samba/run/smbd.pid`
- fi
- if [ -f @l_prefix@/var/samba/run/nmbd.pid ]; then
- kill -TERM `cat @l_prefix@/var/samba/run/nmbd.pid`
- fi
+ samba_signal TERM
%restart -u @l_susr@
rcService samba enable yes || exit 0
- if [ -f @l_prefix@/var/samba/run/smbd.pid ]; then
- kill -TERM `cat @l_prefix@/var/samba/run/smbd.pid`
- fi
- if [ -f @l_prefix@/var/samba/run/nmbd.pid ]; then
- kill -TERM `cat @l_prefix@/var/samba/run/nmbd.pid`
- fi
+ samba_signal TERM
sleep 2
@l_prefix@/sbin/smbd -D
@l_prefix@/sbin/nmbd -D
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/samba/samba.spec
============================================================================
$ cvs diff -u -r1.47 -r1.48 samba.spec
--- openpkg-src/samba/samba.spec 19 Jul 2003 17:06:26 -0000 1.47
+++ openpkg-src/samba/samba.spec 21 Jul 2003 12:08:36 -0000 1.48
@@ -33,7 +33,7 @@
Group: Filesystem
License: GPL
Version: 2.2.8a
-Release: 20030719
+Release: 20030721
# package options
%option with_pam no
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5685 -r1.5686 news.txt
--- openpkg-web/news.txt 21 Jul 2003 11:34:35 -0000 1.5685
+++ openpkg-web/news.txt 21 Jul 2003 12:08:34 -0000 1.5686
@@ -1,3 +1,4 @@
+21-Jul-2003: Upgraded package: P<samba-2.2.8a-20030721>
21-Jul-2003: Upgraded package: P<tcl-8.4.3-20030721>
21-Jul-2003: Upgraded package: P<openpkg-20030721-20030721>
21-Jul-2003: New package: P<dailystrips-1.0.27-20030721>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
