summaryrefslogtreecommitdiff
path: root/net/samba
diff options
context:
space:
mode:
authorjlam <jlam>2001-08-17 16:08:20 +0000
committerjlam <jlam>2001-08-17 16:08:20 +0000
commit9d85289942e6ad7e14134d91a0e6a11e27a39614 (patch)
tree292afd9d6f62a1b043c1a347f71feb77d69f9c8e /net/samba
parentbc63577ae89da15e4420a893271a1fe3e67891d0 (diff)
downloadpkgsrc-9d85289942e6ad7e14134d91a0e6a11e27a39614.tar.gz
Undo changes from previous patch from pkg/12921. The rc.d-style startup
scripts need for the nmbd and smbd programs to always start in daemom-mode, which is why the "-D" flag was set via command_args in the scripts themselves. Any additional options should be passed in through the {nmbd,smbd}_flags settings in /etc/rc.conf. Add comments to reflect this in the scripts. The error reported by the PR author is most likely due to either installing these scripts with ".sh" extensions, which is not how these are installed into the ${PREFIX}/etc/rc.d and is definitely wrong, or in directly sourcing these files from an rc.local script, which is again, definitely wrong.
Diffstat (limited to 'net/samba')
-rwxr-xr-xnet/samba/files/nmbd.sh5
-rwxr-xr-xnet/samba/files/smbd.sh5
2 files changed, 6 insertions, 4 deletions
diff --git a/net/samba/files/nmbd.sh b/net/samba/files/nmbd.sh
index b05094e6a50..56c0e1ca41d 100755
--- a/net/samba/files/nmbd.sh
+++ b/net/samba/files/nmbd.sh
@@ -1,13 +1,14 @@
#!/bin/sh
#
-# $NetBSD: nmbd.sh,v 1.2 2001/05/13 00:44:50 wiz Exp $
+# $NetBSD: nmbd.sh,v 1.3 2001/08/17 16:08:20 jlam Exp $
#
# PROVIDE: nmbd
# REQUIRE: DAEMON
name="nmbd"
command="@PREFIX@/sbin/${name}"
-nmbd_flags="-D"
+command_args="-D" # _must_ start as daemon from rc.d;
+ # add more flags through ${nmbd_flags}
if [ ! -d /etc/rc.d ]
then
diff --git a/net/samba/files/smbd.sh b/net/samba/files/smbd.sh
index 2787f4372e7..b2f551efdc9 100755
--- a/net/samba/files/smbd.sh
+++ b/net/samba/files/smbd.sh
@@ -1,13 +1,14 @@
#!/bin/sh
#
-# $NetBSD: smbd.sh,v 1.2 2001/05/13 00:44:50 wiz Exp $
+# $NetBSD: smbd.sh,v 1.3 2001/08/17 16:08:21 jlam Exp $
#
# PROVIDE: smbd
# REQUIRE: nmbd
name="smbd"
command="@PREFIX@/sbin/${name}"
-smbd_flags="-D"
+command_args="-D" # _must_ start as daemon from rc.d;
+ # add more flags through ${smbd_flags}
if [ ! -d /etc/rc.d ]
then