Merge from msql-beta port as of 04/28/97

Change startup script in ${PREFIX}/etc/rc.d to directly run the daemon instead of using the old kludgey run_daemon wrapper.
Fix up two mistakes in the PLIST
This commit is contained in:
James FitzGibbon 1997-07-14 12:44:42 +00:00
parent 4941677497
commit 42d5f3f5e5
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=7314
4 changed files with 4 additions and 4 deletions

View file

@ -46,7 +46,7 @@ post-install:
@if [ ! -f ${PREFIX}/etc/rc.d/msql2.sh ]; then \
echo "Installing ${PREFIX}/etc/rc.d/msql2.sh startup file."; \
echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/msql2.sh; \
echo "[ -x ${PREFIX}/bin/run_daemon ] && su -l msql -c '${PREFIX}/bin/run_daemon msql2d' & && echo -n ' msql2'" >> ${PREFIX}/etc/rc.d/msql2.sh; \
echo "[ -x ${PREFIX}/bin/msql2d ] && su -l msql -c '${PREFIX}/bin/msql2d' > /dev/null 2>&1 & && echo -n ' msql2'" >> ${PREFIX}/etc/rc.d/msql2.sh; \
chmod 751 ${PREFIX}/etc/rc.d/msql2.sh; \
fi
.if !defined(BATCH)

View file

@ -25,7 +25,6 @@ include/regexp.h
lib/liblite.a
lib/libmsql.a
lib/libregexp.a
lib/libtime.a
lib/lite_lex.o
lib/mod_lite.o
lib/mod_msql.o
@ -33,6 +32,7 @@ lib/mod_std.o
share/doc/msql/License
share/doc/msql/README
share/doc/msql/HISTORY
share/doc/msql/README.sco
share/doc/msql/post-install-notes
share/doc/msql/manual/add.gif
share/doc/msql/manual/api.htm

View file

@ -46,7 +46,7 @@ post-install:
@if [ ! -f ${PREFIX}/etc/rc.d/msql2.sh ]; then \
echo "Installing ${PREFIX}/etc/rc.d/msql2.sh startup file."; \
echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/msql2.sh; \
echo "[ -x ${PREFIX}/bin/run_daemon ] && su -l msql -c '${PREFIX}/bin/run_daemon msql2d' & && echo -n ' msql2'" >> ${PREFIX}/etc/rc.d/msql2.sh; \
echo "[ -x ${PREFIX}/bin/msql2d ] && su -l msql -c '${PREFIX}/bin/msql2d' > /dev/null 2>&1 & && echo -n ' msql2'" >> ${PREFIX}/etc/rc.d/msql2.sh; \
chmod 751 ${PREFIX}/etc/rc.d/msql2.sh; \
fi
.if !defined(BATCH)

View file

@ -25,7 +25,6 @@ include/regexp.h
lib/liblite.a
lib/libmsql.a
lib/libregexp.a
lib/libtime.a
lib/lite_lex.o
lib/mod_lite.o
lib/mod_msql.o
@ -33,6 +32,7 @@ lib/mod_std.o
share/doc/msql/License
share/doc/msql/README
share/doc/msql/HISTORY
share/doc/msql/README.sco
share/doc/msql/post-install-notes
share/doc/msql/manual/add.gif
share/doc/msql/manual/api.htm