summaryrefslogtreecommitdiff
path: root/net-fs
diff options
context:
space:
mode:
authorChristian Andreetta <satya@gentoo.org>2004-06-12 14:45:13 +0000
committerChristian Andreetta <satya@gentoo.org>2004-06-12 14:45:13 +0000
commit34011a1828e15db5c304fd2702c18fe54203f1f2 (patch)
tree500e8439d75353274c85ced1a948c8d799d5ded9 /net-fs
parentversion bump, clean up (diff)
downloadhistorical-34011a1828e15db5c304fd2702c18fe54203f1f2.tar.gz
historical-34011a1828e15db5c304fd2702c18fe54203f1f2.tar.bz2
historical-34011a1828e15db5c304fd2702c18fe54203f1f2.zip
minor init script fix: if a daemon doesn't start, stop all companions
Diffstat (limited to 'net-fs')
-rw-r--r--net-fs/samba/ChangeLog6
-rw-r--r--net-fs/samba/Manifest6
-rw-r--r--net-fs/samba/files/samba-init9
-rw-r--r--net-fs/samba/metadata.xml4
4 files changed, 19 insertions, 6 deletions
diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 9ca1adbf2eed..6c6cb730dfe4 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-fs/samba
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.78 2004/06/11 14:30:14 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.79 2004/06/12 14:45:13 satya Exp $
+
+ 12 Jun 2004; Christian Andreetta <satya@gentoo.org> metadata.xml,
+ files/samba-init:
+ minor init script, as per bug #53676
*samba-3.0.4-r1 (11 Jun 2004)
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 335a433fce64..8094d9de27e0 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,8 +1,8 @@
MD5 df4988eb528ea6b29113ac134b4e29c6 samba-3.0.4-r1.ebuild 11055
MD5 c59ae5e5ce4891972b2a6d61dd3fc455 samba-3.0.1-r1.ebuild 11338
MD5 8dc040986a2a1db5e79dbfe3d2d72010 samba-3.0.2a-r2.ebuild 12185
-MD5 75f98c2c4dec64a34c510e6d9c399457 ChangeLog 16293
-MD5 9dc4a618b56b5e6b4386523dd9c869c9 metadata.xml 373
+MD5 415374ca5f8ea168aa0b764c4e570688 ChangeLog 16421
+MD5 63bc25b07c7404f26d602e69ddad747e metadata.xml 458
MD5 88b5abd8e04f84a7507ab35555f305b7 files/winbind-init 490
MD5 fcebd975211fecf647f6cecf26ba5c96 files/samba-3.0.4.patch 8086
MD5 d57ae3d7c51d488034f992de323e52b8 files/swat.xinetd 524
@@ -11,7 +11,7 @@ MD5 9e78d5e97b1c5f85d9c21636d1f234a4 files/smbldap_conf.pm 7092
MD5 cbaa5a39d9bd67b13f8131b426a4256b files/samba-2.2.5-gp-reloc-fix.patch 431
MD5 c78caa4193cd606b58c158c57b5adbd7 files/nsswitch.conf-wins 389
MD5 41d1e48b5dad9851c75524baa07fb08d files/samba-conf 1231
-MD5 6773834190eaeb4b119e18c422f779bd files/samba-init 958
+MD5 d911202dbaf3b115b6a812cb8cda07ca files/samba-init 1098
MD5 fd2382184b6a07e63cb07ff26b578fd2 files/config-svc-smbd+nmbd 784
MD5 f402c2c4103f4c13ac3cc5fa165940db files/nonroot-bind.diff 757
MD5 5d3129a0f6bcbec6ec91d217881a34e1 files/nsswitch.conf-winbind 298
diff --git a/net-fs/samba/files/samba-init b/net-fs/samba/files/samba-init
index 61080d9333fa..b4b802576a7d 100644
--- a/net-fs/samba/files/samba-init
+++ b/net-fs/samba/files/samba-init
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/samba-init,v 1.5 2004/06/11 14:30:14 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/samba-init,v 1.6 2004/06/12 14:45:13 satya Exp $
opts="${opts} reload"
@@ -35,7 +35,12 @@ function signal_do {
start() {
${my_service_PRE}
signal_do start
- eend $?
+ result_start=$?
+ if [ ${result_start} -gt 0 ]; then
+ ewarn "Error: stopping services (see system logs)"
+ signal_do stop
+ fi
+ eend ${result_start}
}
stop() {
${my_service_PRE}
diff --git a/net-fs/samba/metadata.xml b/net-fs/samba/metadata.xml
index 78ef38c7ac41..f6ad214971de 100644
--- a/net-fs/samba/metadata.xml
+++ b/net-fs/samba/metadata.xml
@@ -2,6 +2,10 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>no-herd</herd>
+<maintainer>
+ <email>samba@gentoo.org</email>
+ <name>Samba Team</name>
+</maintainer>
<longdescription>
Samba is an Open Source/Free Software suite that provides seamless file and print services to SMB/CIFS clients. Samba is freely available under the GNU General Public License.
</longdescription>