aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2013-04-30 13:25:54 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2013-04-30 13:36:47 +0200
commit7367b78628577d330d9c5aa14f752a97cfd18f89 (patch)
tree7e177b345b2891a5e6fd04678217848836403c94
parent82996f6d17d73247734e5b1d84f8fd4d81e936d2 (diff)
downloadaports-7367b78628577d330d9c5aa14f752a97cfd18f89.tar.bz2
aports-7367b78628577d330d9c5aa14f752a97cfd18f89.tar.xz
main/samba: create piddir from init.d script
-rw-r--r--main/samba/APKBUILD8
-rwxr-xr-x[-rw-r--r--]main/samba/samba.initd10
2 files changed, 11 insertions, 7 deletions
diff --git a/main/samba/APKBUILD b/main/samba/APKBUILD
index e45299d555..7a4ae7500f 100644
--- a/main/samba/APKBUILD
+++ b/main/samba/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=samba
pkgver=3.6.13
-pkgrel=0
+pkgrel=1
pkgdesc="Tools to access a server's filespace and printers via SMB"
url="http://www.samba.org"
arch="all"
@@ -154,14 +154,14 @@ client() {
md5sums="b9fe8413cbb6fa4b970a159968db2fb4 samba-3.6.13.tar.gz
-044c756d3c33c2d610c40bcd76cfb75c samba.initd
+0379191dd9f4e4ff07d520c53778ac04 samba.initd
c150433426e18261e6e3eed3930e1a76 samba.confd
b7cafabfb4fa5b3ab5f2e857d8d1c733 samba.logrotate"
sha256sums="992f8ad56717bf551b00ad1d31170588a087fb5c2d4d9cd38fd11544f2b8a596 samba-3.6.13.tar.gz
-86646cb845aababd9e8655994379526f03327a2cc33b489c3a7dea83ab689c8f samba.initd
+779feccabc7f2d6d421fc82ab07a2c1757877d54069084bea95fbfe715f6632d samba.initd
1d12f98a7727967b04eb123109b34cfffef320822dc0e8059286b6e3394c3fc0 samba.confd
4c2b7d529126b2fc4f62fb09d99e49a87632d723a2d9d289a61e37dd84145be1 samba.logrotate"
sha512sums="1b1d72a6166885d168a4892b1e8ed2f0affbcd76819bcbabc4093743b15d6e4972cffd53b7e9770baad95b900c3dbf66259fc410cf8421127585fdfb3ffb270a samba-3.6.13.tar.gz
-59d05252b8ebbe6ba6a419edc86b66b9541d0bac9dbe810cccb20e64f6044e2900cc6c0979e077741ed00fbbf2d51f9184c83715013299782707b44e39aa99b1 samba.initd
+9c00cf3965fbecfb82925828c8d76221e508dd5c8caf524016833d27bd1e6a1f032e652227b9b67b0a4f48bcc81f4e2fe66febc84f5e7e3e90f83a54c3ddf3f5 samba.initd
4faf581ecef3ec38319e3c4ab6d3995c51fd7ba83180dc5553a2ff4dfb92efadb43030c543292130c4ed0c281dc0972c6973d52d48062c5edb39bb1c4bbb6dd6 samba.confd
f88ebe59ca3a9e9b77dd5993c13ef3e73a838efb8ed858088b464a330132d662f33e25c27819e38835389dee23057a3951de11bae1eef55db8ff5e1ec6760053 samba.logrotate"
diff --git a/main/samba/samba.initd b/main/samba/samba.initd
index c352f4304f..b7bef10e72 100644..100755
--- a/main/samba/samba.initd
+++ b/main/samba/samba.initd
@@ -7,6 +7,8 @@ if [ "$DAEMON" != "samba" ]; then
daemon_list=$DAEMON
fi
+PIDDIR=/var/run/samba
+
depend() {
need net
after firewall
@@ -18,7 +20,7 @@ start_smbd() {
}
stop_smbd() {
- start-stop-daemon --stop --quiet --pidfile /var/run/samba/smbd.pid
+ start-stop-daemon --stop --quiet --pidfile ${PIDDIR}/smbd.pid
}
start_nmbd() {
@@ -27,7 +29,7 @@ start_nmbd() {
}
stop_nmbd() {
- start-stop-daemon --stop --quiet --pidfile /var/run/samba/nmbd.pid
+ start-stop-daemon --stop --quiet --pidfile ${PIDDIR}/nmbd.pid
}
start_winbindd() {
@@ -36,10 +38,12 @@ start_winbindd() {
}
stop_winbindd() {
- start-stop-daemon --stop --quiet --pidfile /var/run/samba/winbindd.pid
+ start-stop-daemon --stop --quiet --pidfile ${PIDDIR}/winbindd.pid
}
start() {
+ checkpath --directory --owner root:root \
+ --mode 755 "$PIDDIR"
for i in $daemon_list; do
ebegin "Starting $i"
start_$i