diff options
| author | jlam <jlam@pkgsrc.org> | 2002-08-07 08:30:50 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-08-07 08:30:50 +0000 |
| commit | 64be0dcb4fa7ae1fdc27be4e3bbae1134726f511 (patch) | |
| tree | 71ad4c0bea14e061db3103b538775357e435192b | |
| parent | c6beaeadc679d6cd518deed583538e3b21b77251 (diff) | |
| download | pkgsrc-64be0dcb4fa7ae1fdc27be4e3bbae1134726f511.tar.gz | |
Merge arlad and arlad.sh scripts into one, following pkgsrc convention
for rc.d scripts.
| -rw-r--r-- | net/arla/Makefile | 4 | ||||
| -rw-r--r-- | net/arla/PLIST | 3 | ||||
| -rw-r--r-- | net/arla/files/arlad | 18 | ||||
| -rw-r--r-- | net/arla/files/arlad.sh | 9 |
4 files changed, 14 insertions, 20 deletions
diff --git a/net/arla/Makefile b/net/arla/Makefile index 32269ec205a..5d82aa3ea69 100644 --- a/net/arla/Makefile +++ b/net/arla/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2002/07/12 20:40:31 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2002/08/07 08:30:50 jlam Exp $ # DISTNAME= arla-0.35.8 @@ -88,8 +88,6 @@ post-install: ${FILESDIR}/services ${PREFIX}/share/examples/arla @${INSTALL_DATA} \ ${FILESDIR}/fstab ${PREFIX}/share/examples/arla - @${SED} -e 's|@PREFIX@|${PREFIX}|' ${FILESDIR}/arlad.sh \ - > ${PREFIX}/etc/rc.d/arlad.sh @${SED} -e 's|@PREFIX@|${PREFIX}|' ${FILESDIR}/arlad \ > ${PREFIX}/etc/rc.d/arlad @${ECHO} " " diff --git a/net/arla/PLIST b/net/arla/PLIST index 4f0d1df3cf9..1bb82427c54 100644 --- a/net/arla/PLIST +++ b/net/arla/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2002/07/12 20:40:31 wiz Exp $ +@comment $NetBSD: PLIST,v 1.7 2002/08/07 08:30:50 jlam Exp $ bin/aklog bin/amon bin/bos @@ -18,7 +18,6 @@ etc/SuidCells.default etc/ThisCell.default etc/arla.conf.default etc/rc.d/arlad -etc/rc.d/arlad.sh include/afs/cmd.h include/arlalib.h include/atypes.h diff --git a/net/arla/files/arlad b/net/arla/files/arlad index 85246096400..13c431290de 100644 --- a/net/arla/files/arlad +++ b/net/arla/files/arlad @@ -1,12 +1,13 @@ #!/bin/sh -# $NetBSD: arlad,v 1.1 2001/08/09 13:48:59 wennmach Exp $ # -# start script for arlad (for NetBSD-1.5 and newer) - +# $NetBSD: arlad,v 1.2 2002/08/07 08:30:51 jlam Exp $ +# # PROVIDE: arlad # REQUIRE: beforemountlkm -. /etc/rc.subr +if [ -f /etc/rc.subr ]; then + . /etc/rc.subr +fi name="arlad" rcvar=$name @@ -14,5 +15,10 @@ command="@PREFIX@/libexec/${name}" command_args="-z /dev/xfs0" required_files="/dev/xfs0" -load_rc_config $name -run_rc_command "$1" +if [ -f /etc/rc.subr -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]; then + load_rc_config $name + run_rc_command "$1" +else + echo -n ' ${name}' + ${command} ${arlad_flags} ${command_args} +fi diff --git a/net/arla/files/arlad.sh b/net/arla/files/arlad.sh deleted file mode 100644 index 694ab13700a..00000000000 --- a/net/arla/files/arlad.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -# $NetBSD: arlad.sh,v 1.2 2001/08/09 13:48:59 wennmach Exp $ -# -# start script for arlad (for NetBSD earlier than 1.5) - -if [ -f @PREFIX@/libexec/arlad ]; then - echo -n " arlad" - @PREFIX@/libexec/arlad -z /dev/xfs0 -fi |