[Fedora-directory-commits] ldapserver/wrappers initscript.in, 1.4, 1.5
Richard Allen Megginson (rmeggins)
fedora-directory-commits at redhat.com
Fri Mar 16 23:07:00 UTC 2007
- Previous message (by thread): [Fedora-directory-commits] ldapserver Makefile.am, 1.33, 1.34 aclocal.m4, 1.26, 1.27 configure, 1.35, 1.36 missing, 1.20, 1.21 install-sh, 1.20, 1.21 compile, 1.20, 1.21 depcomp, 1.20, 1.21 config.sub, 1.19, 1.20 config.guess, 1.19, 1.20 Makefile.in, 1.38, 1.39
- Next message (by thread): [Fedora-directory-commits] ldapserver/ldap/admin/src create_instance.c, 1.50, 1.51
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rmeggins
Update of /cvs/dirsec/ldapserver/wrappers
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9059/ldapserver/wrappers
Modified Files:
initscript.in
Log Message:
Resolves: bug 232684
Description: need initscripts for Solaris
Fix Description: I messed up the linux init script - turns out linux echo doesn't like \c, so I created a echo_n() function which is stolen from configure. I had to add @ECHO_N@ and @ECHO_C@ to Makefile.am and have them replaced in initscript.in.
Index: initscript.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/wrappers/initscript.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- initscript.in 16 Mar 2007 20:29:57 -0000 1.4
+++ initscript.in 16 Mar 2007 23:06:58 -0000 1.5
@@ -26,18 +26,24 @@
exit 0
fi
+# Solaris echo cannot use -n - linux echo by default cannot use \c
+echo_n()
+{
+ echo @ECHO_N@ "$*@ECHO_C@"
+}
+
# failure and success are not defined on some platforms
type failure > /dev/null 2>&1 || {
failure()
{
- echo " FAILED\c"
+ echo_n " FAILED"
}
}
type success > /dev/null 2>&1 || {
success()
{
- echo " SUCCESS\c"
+ echo_n " SUCCESS"
}
}
@@ -96,7 +102,7 @@
fi
done
if [ "$2" != "$INSTANCES" ]; then
- echo "$2 is an invalid @package_name@ instance\c"
+ echo_n "$2 is an invalid @package_name@ instance"
failure; echo
exit 1
fi
@@ -111,7 +117,7 @@
errors=0
successes=0
for instance in $INSTANCES; do
- echo " $instance...\c"
+ echo_n " $instance..."
# the server creates pidfile and writes the pid to it when it is fully
# started and available to serve clients
pidfile=$piddir/slapd-$instance.pid
@@ -123,12 +129,12 @@
if [ -f $pidfile ]; then
pid=`cat $pidfile`
if kill -0 $pid > /dev/null 2>&1 ; then
- echo " already running\c"
+ echo_n " already running"
success; echo
successes=`expr $successes + 1`
server_running=1
else
- echo " not running, but pid file exists - attempt to start anyway...\c"
+ echo_n " not running, but pid file exists - attempt to start anyway..."
rm -f $pidfile
fi
fi
@@ -136,7 +142,7 @@
if [ $server_running -eq 0 ] ; then
rm -f $pidfile
rm -f $startpidfile
- fix_pid_dir_ownership $instbase/slapd-$instance
+ fix_pid_dir_ownership $instbase/slapd-$instance
$exec -D $instbase/slapd-$instance -i $pidfile -w $startpidfile
if [ $? -eq 0 ]; then
server_started=1 # well, perhaps not running, but started ok
@@ -212,7 +218,7 @@
pidfile=$piddir/slapd-$instance.pid
if [ -f $pidfile ]; then
pid=`cat $pidfile`
- echo " $instance...\c"
+ echo_n " $instance..."
server_stopped=0
if kill -0 $pid > /dev/null 2>&1 ; then
kill $pid
@@ -249,7 +255,7 @@
fi
done
if [ $errors -ge 1 ]; then
- echo "*** Error: $errors instance(s) unsuccessfully stopped\c"
+ echo_n "*** Error: $errors instance(s) unsuccessfully stopped"
failure; echo
else
rm -f $lockfile
@@ -286,7 +292,7 @@
[ ! -f $lockfile ] || restart
;;
*)
- echo Unknown command $1
+ echo Unknown command $1
echo "Usage: $0 {start|stop|status|restart|condrestart} [instance-name]"
exit 2
esac
- Previous message (by thread): [Fedora-directory-commits] ldapserver Makefile.am, 1.33, 1.34 aclocal.m4, 1.26, 1.27 configure, 1.35, 1.36 missing, 1.20, 1.21 install-sh, 1.20, 1.21 compile, 1.20, 1.21 depcomp, 1.20, 1.21 config.sub, 1.19, 1.20 config.guess, 1.19, 1.20 Makefile.in, 1.38, 1.39
- Next message (by thread): [Fedora-directory-commits] ldapserver/ldap/admin/src create_instance.c, 1.50, 1.51
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Fedora-directory-commits
mailing list