diff options
| author | jlam <jlam@pkgsrc.org> | 2001-11-21 21:38:50 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-11-21 21:38:50 +0000 |
| commit | 892b322f451ae5245d6e3c85a919169078fde83f (patch) | |
| tree | 62d19c3fd37e1ac0c17df9885582a76d4eab225f /net/samba/files | |
| parent | 878e9eaf6acb17ac0eb0bac6ac0ab8bf8008f158 (diff) | |
| download | pkgsrc-892b322f451ae5245d6e3c85a919169078fde83f.tar.gz | |
These rc.d scripts are copied to ${RCD_SCRIPTS_DIR} == /etc/rc.d, so change
the test for pre-rc.d systems to just whether /etc/rc.subr is present.
Diffstat (limited to 'net/samba/files')
| -rwxr-xr-x | net/samba/files/nmbd.sh | 12 | ||||
| -rw-r--r-- | net/samba/files/samba.sh | 14 | ||||
| -rwxr-xr-x | net/samba/files/smbd.sh | 12 |
3 files changed, 19 insertions, 19 deletions
diff --git a/net/samba/files/nmbd.sh b/net/samba/files/nmbd.sh index 95c029f60f9..3e076e3d10a 100755 --- a/net/samba/files/nmbd.sh +++ b/net/samba/files/nmbd.sh @@ -1,11 +1,11 @@ #!/bin/sh # -# $NetBSD: nmbd.sh,v 1.5 2001/11/21 16:44:18 jlam Exp $ +# $NetBSD: nmbd.sh,v 1.6 2001/11/21 21:38:53 jlam Exp $ # # PROVIDE: nmbd # REQUIRE: DAEMON -if [ -d /etc/rc.d -a -f /etc/rc.subr ] +if [ -e /etc/rc.subr ] then . /etc/rc.subr fi @@ -20,11 +20,11 @@ command_args="-D" # _must_ start as daemon from rc.d; reload_cmd=":" # avoid dumping debug output on SIGHUP -if [ ! -d /etc/rc.d ] +if [ -e /etc/rc.subr ] then - @ECHO@ -n ' ${name}' - ${command} ${nmbd_flags} ${command_args} -else load_rc_config $name run_rc_command "$1" +else + @ECHO@ -n ' ${name}' + ${command} ${nmbd_flags} ${command_args} fi diff --git a/net/samba/files/samba.sh b/net/samba/files/samba.sh index 157abe0028a..b4fbdc97fae 100644 --- a/net/samba/files/samba.sh +++ b/net/samba/files/samba.sh @@ -1,11 +1,11 @@ #!/bin/sh # -# $NetBSD: samba.sh,v 1.6 2001/11/21 16:44:18 jlam Exp $ +# $NetBSD: samba.sh,v 1.7 2001/11/21 21:38:53 jlam Exp $ # # PROVIDE: samba # KEYWORD: nostart -if [ -d /etc/rc.d -a -f /etc/rc.subr ] +if [ -e /etc/rc.subr ] then . /etc/rc.subr fi @@ -15,7 +15,7 @@ fi forward_commands() { for file in $COMMAND_LIST; do - /etc/rc.d/$file $_arg + @RCD_SCRIPTS_DIR@/$file $_arg done } @@ -26,7 +26,7 @@ reverse_commands() REVCOMMAND_LIST="$file $REVCOMMAND_LIST" done for file in $REVCOMMAND_LIST; do - /etc/rc.d/$file $_arg + @RCD_SCRIPTS_DIR@/$file $_arg done } @@ -39,11 +39,11 @@ reload_cmd="forward_commands" status_cmd="forward_commands" extra_commands="reload status" -if [ ! -d /etc/rc.d ] +if [ -e /etc/rc.subr ] then + run_rc_command "$1" +else @ECHO@ -n ' ${name}' _arg="$1" ${start_cmd} -else - run_rc_command "$1" fi diff --git a/net/samba/files/smbd.sh b/net/samba/files/smbd.sh index 74b7f8a8c61..1ff02b39102 100755 --- a/net/samba/files/smbd.sh +++ b/net/samba/files/smbd.sh @@ -1,11 +1,11 @@ #!/bin/sh # -# $NetBSD: smbd.sh,v 1.6 2001/11/21 16:44:18 jlam Exp $ +# $NetBSD: smbd.sh,v 1.7 2001/11/21 21:38:53 jlam Exp $ # # PROVIDE: smbd # REQUIRE: DAEMON -if [ -d /etc/rc.d -a -f /etc/rc.subr ] +if [ -e /etc/rc.subr ] then . /etc/rc.subr fi @@ -18,11 +18,11 @@ extra_commands="reload" command_args="-D" # _must_ start as daemon from rc.d; # add more flags through ${${name}_flags} -if [ ! -d /etc/rc.d ] +if [ -e /etc/rc.subr ] then - @ECHO@ -n ' ${name}' - ${command} ${smbd_flags} ${command_args} -else load_rc_config $name run_rc_command "$1" +else + @ECHO@ -n ' ${name}' + ${command} ${smbd_flags} ${command_args} fi |