osaf/services/infrastructure/dtms/scripts/osaf-dtm.in | 28
+++---
osaf/services/infrastructure/dtms/scripts/osaf-transport-monitor.in | 10 +-
osaf/services/infrastructure/dtms/scripts/osaf-transport.in | 4 +-
osaf/services/infrastructure/fm/fms/scripts/osaf-fmd.in | 18 ++--
osaf/services/infrastructure/nid/scripts/opensafd.in | 36
+++++-----
osaf/services/infrastructure/rde/scripts/osaf-rded.in | 20 ++--
osaf/services/saf/amf/amfd/scripts/osaf-amfd.in | 16 ++--
osaf/services/saf/amf/amfnd/scripts/osaf-amfnd.in | 16 ++--
osaf/services/saf/amf/amfwdog/scripts/osaf-amfwd.in | 18 ++--
osaf/services/saf/clmsv/clms/scripts/osaf-clmd.in | 18 ++--
osaf/services/saf/clmsv/nodeagent/scripts/osaf-clmna.in | 18 ++--
osaf/services/saf/cpsv/cpd/scripts/osaf-ckptd.in | 16 ++--
osaf/services/saf/cpsv/cpnd/scripts/osaf-ckptnd.in | 18 ++--
osaf/services/saf/edsv/eds/scripts/osaf-evtd.in | 16 ++--
osaf/services/saf/glsv/gld/scripts/osaf-lckd.in | 16 ++--
osaf/services/saf/glsv/glnd/scripts/osaf-lcknd.in | 18 ++--
osaf/services/saf/immsv/immd/scripts/osaf-immd.in | 18 ++--
osaf/services/saf/immsv/immnd/scripts/osaf-immnd.in | 20 ++--
osaf/services/saf/logsv/lgs/scripts/osaf-logd.in | 18 ++--
osaf/services/saf/mqsv/mqd/scripts/osaf-msgd.in | 16 ++--
osaf/services/saf/mqsv/mqnd/scripts/osaf-msgnd.in | 18 ++--
osaf/services/saf/ntfsv/ntfs/scripts/osaf-ntfd.in | 18 ++--
osaf/services/saf/plmsv/plms/scripts/osaf-plmd.in | 18 ++--
osaf/services/saf/smfsv/smfd/scripts/osaf-smfd.in | 16 ++--
osaf/services/saf/smfsv/smfnd/scripts/osaf-smfnd.in | 18 ++--
25 files changed, 223 insertions(+), 223 deletions(-)
Rename the shell environment variable "prog" to "osafprog" in the OpenSAF
service CLC scripts, to avoid a name collition with a variable in the file
/lib/lsb/init-functions.d/40-systemd which gets included when we source the file
/lib/lsb/init-functions in Ubuntu 16.04
diff --git a/osaf/services/infrastructure/dtms/scripts/osaf-dtm.in
b/osaf/services/infrastructure/dtms/scripts/osaf-dtm.in
--- a/osaf/services/infrastructure/dtms/scripts/osaf-dtm.in
+++ b/osaf/services/infrastructure/dtms/scripts/osaf-dtm.in
@@ -13,7 +13,7 @@
### END INIT INFO
osafdirfile=@sysconfdir@/@PACKAGE_NAME@/osafdir.conf
-prog="osafdtmd"
+osafprog="osafdtmd"
initscript=`basename $0`
# Source LSB functions library
@@ -21,7 +21,7 @@ initscript=`basename $0`
if [ ! -r $osafdirfile ]; then
- logger -s -t $prog "can't read $osafdirfile, exiting."
+ logger -s -t $osafprog "can't read $osafdirfile, exiting."
exit 6
else
. $osafdirfile
@@ -29,8 +29,8 @@ else
. $pkgsysconfdir/nid.conf
fi
-binary=$pkglibdir/$prog
-pidfile=$pkgpiddir/$prog.pid
+binary=$pkglibdir/$osafprog
+pidfile=$pkgpiddir/$osafprog.pid
lockfile=$lockdir/$initscript
RETVAL=0
@@ -41,7 +41,7 @@ start() {
return 5
fi
- echo -n "Starting $prog: "
+ echo -n "Starting $osafprog: "
start_daemon -p $pidfile $binary $args
RETVAL=$?
if [ $RETVAL -eq 0 ]; then
@@ -54,8 +54,8 @@ start() {
}
stop() {
- echo -n "Stopping $prog: "
- killproc -p $pidfile $prog
+ echo -n "Stopping $osafprog: "
+ killproc -p $pidfile $osafprog
RETVAL=$?
if [ $RETVAL -eq 0 ] || [ $RETVAL -eq 7 ]; then
rm -f $lockfile
@@ -78,9 +78,9 @@ tryrestart() {
}
reload() {
- echo -n "Reloading $prog: "
+ echo -n "Reloading $osafprog: "
log_warning_msg
- logger -t $prog "reloading configuration is currently an unimplemented
LSB feature"
+ logger -t $osafprog "reloading configuration is currently an
unimplemented LSB feature"
return 3
}
@@ -94,16 +94,16 @@ status() {
pid=`pidofproc -p ${pidfile} ${binary}`
ret=$?
if [ $ret -eq 0 ]; then
- log_success_msg "$prog is running"
+ log_success_msg "$osafprog is running"
return $ret
elif [ $ret -eq 1 ]; then
- log_warning_msg "$prog is dead and /var/run pid file exists"
+ log_warning_msg "$osafprog is dead and /var/run pid file exists"
elif [ $ret -eq 2 ]; then
- log_warning_msg "$prog is dead and /var/lock lock file exists"
+ log_warning_msg "$osafprog is dead and /var/lock lock file
exists"
elif [ $ret -eq 3 ]; then
- echo "$prog is not running"
+ echo "$osafprog is not running"
elif [ $ret -eq 4 ]; then
- log_warning_msg "$prog or service status is unknown"
+ log_warning_msg "$osafprog or service status is unknown"
fi
return $ret
}
diff --git
a/osaf/services/infrastructure/dtms/scripts/osaf-transport-monitor.in
b/osaf/services/infrastructure/dtms/scripts/osaf-transport-monitor.in
--- a/osaf/services/infrastructure/dtms/scripts/osaf-transport-monitor.in
+++ b/osaf/services/infrastructure/dtms/scripts/osaf-transport-monitor.in
@@ -20,7 +20,7 @@ osafdirfile=@sysconfdir@/@PACKAGE_NAME@/
. /lib/lsb/init-functions
if [ ! -r $osafdirfile ]; then
- logger -t $prog "can't read $osafdirfile, exiting."
+ logger -t $osafprog "can't read $osafdirfile, exiting."
exit 6
else
. $osafdirfile
@@ -28,19 +28,19 @@ else
fi
if [ ! "$MDS_TRANSPORT" = "TIPC" ] ; then
- prog="osafdtmd"
+ osafprog="osafdtmd"
#Read the pid of dtmd.
count=0
while true
do
if [ $count -eq 15 ] ; then
- logger -s -t $prog "dtmd failed to come up. "
+ logger -s -t $osafprog "dtmd failed to come up. "
$pkglibdir/opensaf_reboot 0
exit 0;
fi
- pidval=`cat $pkgpiddir/$prog.pid`
+ pidval=`cat $pkgpiddir/$osafprog.pid`
if ! test -d /proc/$pidval ; then
#dtmd may not have been spawned yet, wait for it.
sleep 1
@@ -68,7 +68,7 @@ do
while [ $count -le 15 ]
do
if ! test -d /proc/$pidval ; then
- logger -s -t $prog "$prog Process down,
Rebooting the node"
+ logger -s -t $osafprog "$osafprog Process down,
Rebooting the node"
$pkglibdir/opensaf_reboot 0
exit 0;
fi
diff --git a/osaf/services/infrastructure/dtms/scripts/osaf-transport.in
b/osaf/services/infrastructure/dtms/scripts/osaf-transport.in
--- a/osaf/services/infrastructure/dtms/scripts/osaf-transport.in
+++ b/osaf/services/infrastructure/dtms/scripts/osaf-transport.in
@@ -18,7 +18,7 @@ osafdirfile=@sysconfdir@/@PACKAGE_NAME@/
. /lib/lsb/init-functions
if [ ! -r $osafdirfile ]; then
- logger -t $prog "can't read $osafdirfile, exiting."
+ logger -t $osafprog "can't read $osafdirfile, exiting."
exit 6
else
. $osafdirfile
@@ -30,7 +30,7 @@ MANAGE_TIPC=${OPENSAF_MANAGE_TIPC:="yes"
RETVAL=0
if [ ! "$MDS_TRANSPORT" = "TIPC" ] ; then
- prog="osafdtmd"
+ osafprog="osafdtmd"
fi
start() {
diff --git a/osaf/services/infrastructure/fm/fms/scripts/osaf-fmd.in
b/osaf/services/infrastructure/fm/fms/scripts/osaf-fmd.in
--- a/osaf/services/infrastructure/fm/fms/scripts/osaf-fmd.in
+++ b/osaf/services/infrastructure/fm/fms/scripts/osaf-fmd.in
@@ -14,14 +14,14 @@
osafdirfile=@sysconfdir@/@PACKAGE_NAME@/osafdir.conf
nodeinfofile=@sysconfdir@/plmcd.conf
-prog="osaffmd"
+osafprog="osaffmd"
initscript=`basename $0`
# Source LSB functions library
. /lib/lsb/init-functions
if [ ! -r $osafdirfile ]; then
- logger -t $prog "can't read $osafdirfile, exiting."
+ logger -t $osafprog "can't read $osafdirfile, exiting."
exit 6
else
. $osafdirfile
@@ -36,8 +36,8 @@ if [ -f $nodeinfofile ]; then
fi
fi
-binary=$pkglibdir/$prog
-pidfile=$pkgpiddir/$prog.pid
+binary=$pkglibdir/$osafprog
+pidfile=$pkgpiddir/$osafprog.pid
lockfile=$lockdir/$initscript
RETVAL=0
@@ -52,7 +52,7 @@ start() {
exit 5
fi
export FM_COMP_NAME_FILE=$COMPNAMEFILE
- echo -n "Starting $prog: "
+ echo -n "Starting $osafprog: "
start_daemon -p $pidfile $binary $args
RETVAL=$?
if [ $RETVAL -eq 0 ]; then
@@ -66,7 +66,7 @@ start() {
}
instantiate() {
- echo -n "AMF Instantiating $prog: "
+ echo -n "AMF Instantiating $osafprog: "
echo $SA_AMF_COMPONENT_NAME > $COMPNAMEFILE
pidofproc -p $pidfile $binary
RETVAL=$?
@@ -86,7 +86,7 @@ instantiate() {
}
stop() {
- echo -n "Stopping $prog: "
+ echo -n "Stopping $osafprog: "
killproc -p $pidfile $binary
RETVAL=$?
if [ $RETVAL -eq 0 ] || [ $RETVAL -eq 7 ]; then
@@ -111,9 +111,9 @@ tryrestart() {
}
reload() {
- echo -n "Reloading $prog: "
+ echo -n "Reloading $osafprog: "
log_warning_msg
- logger -t $prog "reloading configuration is currently an unimplemented
LSB feature"
+ logger -t $osafprog "reloading configuration is currently an
unimplemented LSB feature"
return 3
}
diff --git a/osaf/services/infrastructure/nid/scripts/opensafd.in
b/osaf/services/infrastructure/nid/scripts/opensafd.in
--- a/osaf/services/infrastructure/nid/scripts/opensafd.in
+++ b/osaf/services/infrastructure/nid/scripts/opensafd.in
@@ -13,21 +13,21 @@
### END INIT INFO
osafdirfile=@sysconfdir@/@PACKAGE_NAME@/osafdir.conf
-prog="opensafd"
+osafprog="opensafd"
# Source LSB functions library
. /lib/lsb/init-functions
if [ ! -r $osafdirfile ]; then
- logger -t $prog "can't read $osafdirfile, exiting."
+ logger -t $osafprog "can't read $osafdirfile, exiting."
exit 6
else
. $osafdirfile
. $pkgsysconfdir/nid.conf
fi
-binary=$pkglibdir/$prog
-lockfile=$lockdir/$prog
+binary=$pkglibdir/$osafprog
+lockfile=$lockdir/$osafprog
amfnd_bin=$pkglibdir/osafamfnd
amfnd_pid=$pkgpiddir/osafamfnd.pid
@@ -51,7 +51,7 @@ unload_tipc() {
if [ $MANAGE_TIPC = "yes" ] && grep tipc /proc/modules >/dev/null 2>&1;
then
modprobe -r tipc >/dev/null 2>&1
if [ $? -eq 1 ]; then
- logger -t $prog "warning: TIPC module unloading failed"
+ logger -t $osafprog "warning: TIPC module unloading
failed"
fi
fi
}
@@ -61,7 +61,7 @@ check_tipc() {
if [ ! -x /sbin/tipc-config ]; then
which tipc-config >/dev/null 2>&1
if [ $? -eq 1 ] ; then
- logger -s -t $prog "Can't find tipc-config in the PATH,
exiting."
+ logger -s -t $osafprog "Can't find tipc-config in the
PATH, exiting."
exit 5
fi
fi
@@ -72,7 +72,7 @@ check_tipc() {
check_env() {
# Make sure this kernel has POSIX shared memory configured
if [ ! -d /dev/shm ]; then
- logger -s -t $prog "POSIX shared memory (/dev/shm) not enabled,
exiting."
+ logger -s -t $osafprog "POSIX shared memory (/dev/shm) not
enabled, exiting."
exit 6
fi
@@ -212,7 +212,7 @@ start() {
check_env
check_transport
- logger -t $prog "Starting OpenSAF Services($osafversion - $osafcshash)
(Using $MDS_TRANSPORT)"
+ logger -t $osafprog "Starting OpenSAF Services($osafversion -
$osafcshash) (Using $MDS_TRANSPORT)"
# Comment/Uncomment if you want cores disabled/enabled
#enable_coredump
@@ -221,25 +221,25 @@ start() {
start_daemon $binary $args
RETVAL=$?
if [ $RETVAL -eq 0 ]; then
- logger -t $prog "OpenSAF($osafversion - $osafcshash) services
successfully started"
+ logger -t $osafprog "OpenSAF($osafversion - $osafcshash)
services successfully started"
touch $lockfile
log_success_msg
else
final_clean
log_failure_msg
if [ $REBOOT_ON_FAIL_TIMEOUT -ne 0 ]; then
- logger -t $prog "Starting OpenSAF failed, rebooting..."
+ logger -t $osafprog "Starting OpenSAF failed,
rebooting..."
sleep $REBOOT_ON_FAIL_TIMEOUT
/sbin/reboot &
else
- logger -t $prog "Starting OpenSAF failed"
+ logger -t $osafprog "Starting OpenSAF failed"
fi
fi
return $RETVAL
}
stop() {
- logger -t $prog "Stopping OpenSAF Services"
+ logger -t $osafprog "Stopping OpenSAF Services"
killall -s KILL osaf-transport-monitor >/dev/null 2>&1
@@ -255,7 +255,7 @@ stop() {
done
[ -d /proc/$amfpid ] && RETVAL=1
if [ $RETVAL -eq 1 ]; then
- logger -t $prog "amfnd has not yet exited, killing it
forcibly."
+ logger -t $osafprog "amfnd has not yet exited, killing
it forcibly."
kill -9 $amfpid
fi
else
@@ -265,18 +265,18 @@ stop() {
final_clean
if [ $RETVAL -eq 0 ]; then
- logger -t $prog "OpenSAF services successfully stopped"
+ logger -t $osafprog "OpenSAF services successfully stopped"
log_success_msg
else
log_failure_msg
# If AMF fails to terminate its components,
# this system is out of control, reboot it now!
if [ $REBOOT_ON_FAIL_TIMEOUT -ne 0 ]; then
- logger -t $prog "Stopping OpenSAF failed, rebooting..."
+ logger -t $osafprog "Stopping OpenSAF failed,
rebooting..."
sleep $REBOOT_ON_FAIL_TIMEOUT
/sbin/shutdown -r now "OpenSAF termination failed
(timeout)"
else
- logger -t $prog "Stoping OpenSAF failed"
+ logger -t $osafprog "Stoping OpenSAF failed"
fi
fi
return $RETVAL
@@ -293,9 +293,9 @@ tryrestart() {
}
reload() {
- echo -n "Reloading $prog: "
+ echo -n "Reloading $osafprog: "
log_warning_msg
- logger -t $prog "reloading configuration is currently an unimplemented
LSB feature"
+ logger -t $osafprog "reloading configuration is currently an
unimplemented LSB feature"
return 3
}
diff --git a/osaf/services/infrastructure/rde/scripts/osaf-rded.in
b/osaf/services/infrastructure/rde/scripts/osaf-rded.in
--- a/osaf/services/infrastructure/rde/scripts/osaf-rded.in
+++ b/osaf/services/infrastructure/rde/scripts/osaf-rded.in
@@ -13,14 +13,14 @@
### END INIT INFO
osafdirfile=@sysconfdir@/@PACKAGE_NAME@/osafdir.conf
-prog="osafrded"
+osafprog="osafrded"
initscript=`basename $0`
# Source LSB functions library
. /lib/lsb/init-functions
if [ ! -r $osafdirfile ]; then
- logger -t $prog "can't read $osafdirfile, exiting."
+ logger -t $osafprog "can't read $osafdirfile, exiting."
exit 6
else
. $osafdirfile
@@ -28,9 +28,9 @@ else
. $pkgsysconfdir/rde.conf
fi
-binary=$pkglibdir/$prog
-pidfile=$pkgpiddir/$prog.pid
-tracefile=$pkglogdir/$prog.log
+binary=$pkglibdir/$osafprog
+pidfile=$pkgpiddir/$osafprog.pid
+tracefile=$pkglogdir/$osafprog.log
lockfile=$lockdir/$initscript
sockfile=$pkglocalstatedir/rde_rda.sock
@@ -46,7 +46,7 @@ start() {
exit 5
fi
export RDE_COMP_NAME_FILE=$COMPNAMEFILE
- echo -n "Starting $prog: "
+ echo -n "Starting $osafprog: "
start_daemon -p $pidfile $binary $args
RETVAL=$?
if [ $RETVAL -eq 0 ]; then
@@ -60,7 +60,7 @@ start() {
}
instantiate() {
- echo -n "AMF Instantiating $prog: "
+ echo -n "AMF Instantiating $osafprog: "
echo $SA_AMF_COMPONENT_NAME > $COMPNAMEFILE
pidofproc -p $pidfile $binary
RETVAL=$?
@@ -80,7 +80,7 @@ instantiate() {
}
stop() {
- echo -n "Stopping $prog: "
+ echo -n "Stopping $osafprog: "
killproc -p $pidfile $binary
RETVAL=$?
if [ $RETVAL -eq 0 ] || [ $RETVAL -eq 7 ]; then
@@ -106,9 +106,9 @@ tryrestart() {
}
reload() {
- echo -n "Reloading $prog: "
+ echo -n "Reloading $osafprog: "
log_warning_msg
- logger -t $prog "reloading configuration is currently an unimplemented
LSB feature"
+ logger -t $osafprog "reloading configuration is currently an
unimplemented LSB feature"
return 3
}
diff --git a/osaf/services/saf/amf/amfd/scripts/osaf-amfd.in
b/osaf/services/saf/amf/amfd/scripts/osaf-amfd.in
--- a/osaf/services/saf/amf/amfd/scripts/osaf-amfd.in
+++ b/osaf/services/saf/amf/amfd/scripts/osaf-amfd.in
@@ -13,14 +13,14 @@
### END INIT INFO
osafdirfile=@sysconfdir@/@PACKAGE_NAME@/osafdir.conf
-prog="osafamfd"
+osafprog="osafamfd"
initscript=`basename $0`
# Source LSB functions library
. /lib/lsb/init-functions
if [ ! -r $osafdirfile ]; then
- logger -t $prog "can't read $osafdirfile, exiting."
+ logger -t $osafprog "can't read $osafdirfile, exiting."
exit 6
else
. $osafdirfile
@@ -28,8 +28,8 @@ else
. $pkgsysconfdir/amfd.conf
fi
-binary=$pkglibdir/$prog
-pidfile=$pkgpiddir/$prog.pid
+binary=$pkglibdir/$osafprog
+pidfile=$pkgpiddir/$osafprog.pid
lockfile=$lockdir/$initscript
RETVAL=0
@@ -42,7 +42,7 @@ start() {
echo "$NID_MAGIC:$NIDSERV:$DAEMON_NOT_FND" > $NIDFIFO
exit 5
fi
- echo -n "Starting $prog: "
+ echo -n "Starting $osafprog: "
start_daemon -p $pidfile $binary $args
RETVAL=$?
if [ $RETVAL -eq 0 ]; then
@@ -56,7 +56,7 @@ start() {
}
stop() {
- echo -n "Stopping $prog: "
+ echo -n "Stopping $osafprog: "
killproc -p $pidfile $binary
RETVAL=$?
if [ $RETVAL -eq 0 ] || [ $RETVAL -eq 7 ]; then
@@ -80,8 +80,8 @@ tryrestart() {
}
reload() {
- echo -n "Reloading $prog: "
- logger -t $prog "reloading configuration is currently an unimplemented
LSB feature"
+ echo -n "Reloading $osafprog: "
+ logger -t $osafprog "reloading configuration is currently an
unimplemented LSB feature"
log_warning_msg
return 3
}
diff --git a/osaf/services/saf/amf/amfnd/scripts/osaf-amfnd.in
b/osaf/services/saf/amf/amfnd/scripts/osaf-amfnd.in
--- a/osaf/services/saf/amf/amfnd/scripts/osaf-amfnd.in
+++ b/osaf/services/saf/amf/amfnd/scripts/osaf-amfnd.in
@@ -13,14 +13,14 @@
### END INIT INFO
osafdirfile=@sysconfdir@/@PACKAGE_NAME@/osafdir.conf
-prog="osafamfnd"
+osafprog="osafamfnd"
initscript=`basename $0`
# Source LSB functions library
. /lib/lsb/init-functions
if [ ! -r $osafdirfile ]; then
- logger -t $prog "can't read $osafdirfile, exiting."
+ logger -t $osafprog "can't read $osafdirfile, exiting."
exit 6
else
. $osafdirfile
@@ -28,8 +28,8 @@ else
. $pkgsysconfdir/amfnd.conf
fi
-binary=$pkglibdir/$prog
-pidfile=$pkgpiddir/$prog.pid
+binary=$pkglibdir/$osafprog
+pidfile=$pkgpiddir/$osafprog.pid
lockfile=$lockdir/$initscript
RETVAL=0
@@ -42,7 +42,7 @@ start() {
echo "$NID_MAGIC:$NIDSERV:$DAEMON_NOT_FND" > $NIDFIFO
exit 5
fi
- echo -n "Starting $prog: "
+ echo -n "Starting $osafprog: "
start_daemon -p $pidfile $binary $args
RETVAL=$?
if [ $RETVAL -eq 0 ]; then
@@ -56,7 +56,7 @@ start() {
}
stop() {
- echo -n "Stopping $prog: "
+ echo -n "Stopping $osafprog: "
killproc -p $pidfile $binary
RETVAL=$?
if [ $RETVAL -eq 0 ] || [ $RETVAL -eq 7 ]; then
@@ -80,9 +80,9 @@ tryrestart() {
}
reload() {
- echo -n "Reloading $prog: "
+ echo -n "Reloading $osafprog: "
log_warning_msg
- logger -t $prog "reloading configuration is currently an unimplemented
LSB feature"
+ logger -t $osafprog "reloading configuration is currently an
unimplemented LSB feature"
return 3
}
diff --git a/osaf/services/saf/amf/amfwdog/scripts/osaf-amfwd.in
b/osaf/services/saf/amf/amfwdog/scripts/osaf-amfwd.in
--- a/osaf/services/saf/amf/amfwdog/scripts/osaf-amfwd.in
+++ b/osaf/services/saf/amf/amfwdog/scripts/osaf-amfwd.in
@@ -13,14 +13,14 @@
### END INIT INFO
osafdirfile=@sysconfdir@/@PACKAGE_NAME@/osafdir.conf
-prog="osafamfwd"
+osafprog="osafamfwd"
initscript=`basename $0`
# Source LSB functions library
. /lib/lsb/init-functions
if [ ! -r $osafdirfile ]; then
- logger -t $prog "can't read $osafdirfile, exiting."
+ logger -t $osafprog "can't read $osafdirfile, exiting."
exit 6
else
. $osafdirfile
@@ -28,10 +28,10 @@ else
. $pkgsysconfdir/amfwdog.conf
fi
-binary=$pkglibdir/$prog
-pidfile=$pkgpiddir/$prog.pid
+binary=$pkglibdir/$osafprog
+pidfile=$pkgpiddir/$osafprog.pid
lockfile=$lockdir/$initscript
-termfile=$pkgpiddir/$prog"_termstate"
+termfile=$pkgpiddir/$osafprog"_termstate"
RETVAL=0
@@ -48,7 +48,7 @@ start() {
[ -e $termfile ] && killproc -p $pidfile $binary
[ -x $binary ] || exit 5
- echo -n "Starting $prog: "
+ echo -n "Starting $osafprog: "
start_daemon -p $pidfile $binary $args
RETVAL=$?
if [ $RETVAL -eq 0 ]; then
@@ -62,7 +62,7 @@ start() {
}
stop() {
- echo -n "Stopping $prog: "
+ echo -n "Stopping $osafprog: "
killproc -p $pidfile $binary
RETVAL=$?
if [ $RETVAL -eq 0 ] || [ $RETVAL -eq 7 ]; then
@@ -87,9 +87,9 @@ tryrestart() {
}
reload() {
- echo -n "Reloading $prog: "
+ echo -n "Reloading $osafprog: "
log_warning_msg
- logger -t $prog "reloading configuration is currently an unimplemented
LSB feature"
+ logger -t $osafprog "reloading configuration is currently an
unimplemented LSB feature"
return 3
}
diff --git a/osaf/services/saf/clmsv/clms/scripts/osaf-clmd.in
b/osaf/services/saf/clmsv/clms/scripts/osaf-clmd.in
--- a/osaf/services/saf/clmsv/clms/scripts/osaf-clmd.in
+++ b/osaf/services/saf/clmsv/clms/scripts/osaf-clmd.in
@@ -13,14 +13,14 @@
### END INIT INFO
osafdirfile=@sysconfdir@/@PACKAGE_NAME@/osafdir.conf
-prog="osafclmd"
+osafprog="osafclmd"
initscript=`basename $0`
# Source LSB functions library
. /lib/lsb/init-functions
if [ ! -r $osafdirfile ]; then
- logger -t $prog "can't read $osafdirfile, exiting."
+ logger -t $osafprog "can't read $osafdirfile, exiting."
exit 6
else
. $osafdirfile
@@ -28,8 +28,8 @@ else
. $pkgsysconfdir/clmd.conf
fi
-binary=$pkglibdir/$prog
-pidfile=$pkgpiddir/$prog.pid
+binary=$pkglibdir/$osafprog
+pidfile=$pkgpiddir/$osafprog.pid
lockfile=$lockdir/$initscript
RETVAL=0
@@ -44,7 +44,7 @@ start() {
exit 5
fi
export CLMD_COMP_NAME_FILE=$COMPNAMEFILE
- echo -n "Starting $prog: "
+ echo -n "Starting $osafprog: "
start_daemon -p $pidfile $binary $args
RETVAL=$?
if [ $RETVAL -eq 0 ]; then
@@ -58,7 +58,7 @@ start() {
}
instantiate() {
- echo -n "AMF Instantiating $prog: "
+ echo -n "AMF Instantiating $osafprog: "
echo $SA_AMF_COMPONENT_NAME > $COMPNAMEFILE
pidofproc -p $pidfile $binary
RETVAL=$?
@@ -78,7 +78,7 @@ instantiate() {
}
stop() {
- echo -n "Stopping $prog: "
+ echo -n "Stopping $osafprog: "
killproc -p $pidfile $binary
RETVAL=$?
if [ $RETVAL -eq 0 ] || [ $RETVAL -eq 7 ]; then
@@ -103,9 +103,9 @@ tryrestart() {
}
reload() {
- echo -n "Reloading $prog: "
+ echo -n "Reloading $osafprog: "
log_warning_msg
- logger -t $prog "reloading configuration is currently an unimplemented
LSB feature"
+ logger -t $osafprog "reloading configuration is currently an
unimplemented LSB feature"
return 3
}
diff --git a/osaf/services/saf/clmsv/nodeagent/scripts/osaf-clmna.in
b/osaf/services/saf/clmsv/nodeagent/scripts/osaf-clmna.in
--- a/osaf/services/saf/clmsv/nodeagent/scripts/osaf-clmna.in
+++ b/osaf/services/saf/clmsv/nodeagent/scripts/osaf-clmna.in
@@ -13,14 +13,14 @@
### END INIT INFO
osafdirfile=@sysconfdir@/@PACKAGE_NAME@/osafdir.conf
-prog="osafclmna"
+osafprog="osafclmna"
initscript=`basename $0`
# Source LSB functions library
. /lib/lsb/init-functions
if [ ! -r $osafdirfile ]; then
- logger -t $prog "can't read $osafdirfile, exiting."
+ logger -t $osafprog "can't read $osafdirfile, exiting."
exit 6
else
. $osafdirfile
@@ -28,8 +28,8 @@ else
. $pkgsysconfdir/clmna.conf
fi
-binary=$pkglibdir/$prog
-pidfile=$pkgpiddir/$prog.pid
+binary=$pkglibdir/$osafprog
+pidfile=$pkgpiddir/$osafprog.pid
lockfile=$lockdir/$initscript
RETVAL=0
@@ -40,7 +40,7 @@ start() {
export LD_LIBRARY_PATH=$pkglibdir:$LD_LIBRARY_PATH
[ -x $binary ] || exit 5
export CLMNA_COMP_NAME_FILE=$COMPNAMEFILE
- echo -n "Starting $prog: "
+ echo -n "Starting $osafprog: "
start_daemon -p $pidfile $binary $args
RETVAL=$?
if [ $RETVAL -eq 0 ]; then
@@ -53,7 +53,7 @@ start() {
}
instantiate() {
- echo -n "AMF Instantiating $prog: "
+ echo -n "AMF Instantiating $osafprog: "
echo $SA_AMF_COMPONENT_NAME > $COMPNAMEFILE
pidofproc -p $pidfile $binary
RETVAL=$?
@@ -73,7 +73,7 @@ instantiate() {
}
stop() {
- echo -n "Stopping $prog: "
+ echo -n "Stopping $osafprog: "
killproc -p $pidfile $binary
RETVAL=$?
if [ $RETVAL -eq 0 ] || [ $RETVAL -eq 7 ]; then
@@ -97,9 +97,9 @@ tryrestart() {
}
reload() {
- echo -n "Reloading $prog: "
+ echo -n "Reloading $osafprog: "
log_warning_msg
- logger -t $prog "reloading configuration is currently an unimplemented
LSB feature"
+ logger -t $osafprog "reloading configuration is currently an
unimplemented LSB feature"
return 3
}
diff --git a/osaf/services/saf/cpsv/cpd/scripts/osaf-ckptd.in
b/osaf/services/saf/cpsv/cpd/scripts/osaf-ckptd.in
--- a/osaf/services/saf/cpsv/cpd/scripts/osaf-ckptd.in
+++ b/osaf/services/saf/cpsv/cpd/scripts/osaf-ckptd.in
@@ -13,29 +13,29 @@
### END INIT INFO
osafdirfile=@sysconfdir@/@PACKAGE_NAME@/osafdir.conf
-prog="osafckptd"
+osafprog="osafckptd"
initscript=`basename $0`
# Source LSB functions library
. /lib/lsb/init-functions
if [ ! -r $osafdirfile ]; then
- logger -t $prog "can't read $osafdirfile, exiting."
+ logger -t $osafprog "can't read $osafdirfile, exiting."
exit 6
else
. $osafdirfile
. $pkgsysconfdir/ckptd.conf
fi
-binary=$pkglibdir/$prog
-pidfile=$pkgpiddir/$prog.pid
+binary=$pkglibdir/$osafprog
+pidfile=$pkgpiddir/$osafprog.pid
lockfile=$lockdir/$initscript
RETVAL=0
start() {
[ -x $binary ] || exit 5
- echo -n "Starting $prog: "
+ echo -n "Starting $osafprog: "
start_daemon -p $pidfile $binary $args
RETVAL=$?
if [ $RETVAL -eq 0 ]; then
@@ -48,7 +48,7 @@ start() {
}
stop() {
- echo -n "Stopping $prog: "
+ echo -n "Stopping $osafprog: "
killproc -p $pidfile $binary
RETVAL=$?
if [ $RETVAL -eq 0 ] || [ $RETVAL -eq 7 ]; then
@@ -72,9 +72,9 @@ tryrestart() {
}
reload() {
- echo -n "Reloading $prog: "
+ echo -n "Reloading $osafprog: "
log_warning_msg
- logger -t $prog "reloading configuration is currently an unimplemented
LSB feature"
+ logger -t $osafprog "reloading configuration is currently an
unimplemented LSB feature"
return 3
}
diff --git a/osaf/services/saf/cpsv/cpnd/scripts/osaf-ckptnd.in
b/osaf/services/saf/cpsv/cpnd/scripts/osaf-ckptnd.in
--- a/osaf/services/saf/cpsv/cpnd/scripts/osaf-ckptnd.in
+++ b/osaf/services/saf/cpsv/cpnd/scripts/osaf-ckptnd.in
@@ -13,24 +13,24 @@
### END INIT INFO
osafdirfile=@sysconfdir@/@PACKAGE_NAME@/osafdir.conf
-prog="osafckptnd"
+osafprog="osafckptnd"
initscript=`basename $0`
# Source LSB functions library
. /lib/lsb/init-functions
if [ ! -r $osafdirfile ]; then
- logger -t $prog "can't read $osafdirfile, exiting."
+ logger -t $osafprog "can't read $osafdirfile, exiting."
exit 6
else
. $osafdirfile
. $pkgsysconfdir/ckptnd.conf
fi
-binary=$pkglibdir/$prog
-pidfile=$pkgpiddir/$prog.pid
+binary=$pkglibdir/$osafprog
+pidfile=$pkgpiddir/$osafprog.pid
lockfile=$lockdir/$initscript
-termfile=$pkgpiddir/$prog"_termstate"
+termfile=$pkgpiddir/$osafprog"_termstate"
RETVAL=0
@@ -47,7 +47,7 @@ start() {
export LD_LIBRARY_PATH=$pkglibdir:$LD_LIBRARY_PATH
[ -x $binary ] || exit 5
- echo -n "Starting $prog: "
+ echo -n "Starting $osafprog: "
start_daemon -p $pidfile $binary $args
RETVAL=$?
if [ $RETVAL -eq 0 ]; then
@@ -61,7 +61,7 @@ start() {
}
stop() {
- echo -n "Stopping $prog: "
+ echo -n "Stopping $osafprog: "
killproc -p $pidfile $binary
RETVAL=$?
if [ $RETVAL -eq 0 ] || [ $RETVAL -eq 7 ]; then
@@ -86,9 +86,9 @@ tryrestart() {
}
reload() {
- echo -n "Reloading $prog: "
+ echo -n "Reloading $osafprog: "
log_warning_msg
- logger -t $prog "reloading configuration is currently an unimplemented
LSB feature"
+ logger -t $osafprog "reloading configuration is currently an
unimplemented LSB feature"
return 3
}
diff --git a/osaf/services/saf/edsv/eds/scripts/osaf-evtd.in
b/osaf/services/saf/edsv/eds/scripts/osaf-evtd.in
--- a/osaf/services/saf/edsv/eds/scripts/osaf-evtd.in
+++ b/osaf/services/saf/edsv/eds/scripts/osaf-evtd.in
@@ -13,14 +13,14 @@
### END INIT INFO
osafdirfile=@sysconfdir@/@PACKAGE_NAME@/osafdir.conf
-prog="osafevtd"
+osafprog="osafevtd"
initscript=`basename $0`
# Source LSB functions library
. /lib/lsb/init-functions
if [ ! -r $osafdirfile ]; then
- logger -t $prog "can't read $osafdirfile, exiting."
+ logger -t $osafprog "can't read $osafdirfile, exiting."
exit 6
else
. $osafdirfile
@@ -28,8 +28,8 @@ else
. $pkgsysconfdir/evtd.conf
fi
-binary=$pkglibdir/$prog
-pidfile=$pkgpiddir/$prog.pid
+binary=$pkglibdir/$osafprog
+pidfile=$pkgpiddir/$osafprog.pid
lockfile=$lockdir/$initscript
RETVAL=0
@@ -37,7 +37,7 @@ RETVAL=0
start() {
export LD_LIBRARY_PATH=$pkglibdir:$LD_LIBRARY_PATH
[ -x $binary ] || exit 5
- echo -n "Starting $prog: "
+ echo -n "Starting $osafprog: "
start_daemon -p $pidfile $binary $args
RETVAL=$?
if [ $RETVAL -eq 0 ]; then
@@ -50,7 +50,7 @@ start() {
}
stop() {
- echo -n "Stopping $prog: "
+ echo -n "Stopping $osafprog: "
killproc -p $pidfile $binary
RETVAL=$?
if [ $RETVAL -eq 0 ] || [ $RETVAL -eq 7 ]; then
@@ -74,9 +74,9 @@ tryrestart() {
}
reload() {
- echo -n "Reloading $prog: "
+ echo -n "Reloading $osafprog: "
log_warning_msg
- logger -t $prog "reloading configuration is currently an unimplemented
LSB feature"
+ logger -t $osafprog "reloading configuration is currently an
unimplemented LSB feature"
return 3
}
diff --git a/osaf/services/saf/glsv/gld/scripts/osaf-lckd.in
b/osaf/services/saf/glsv/gld/scripts/osaf-lckd.in
--- a/osaf/services/saf/glsv/gld/scripts/osaf-lckd.in
+++ b/osaf/services/saf/glsv/gld/scripts/osaf-lckd.in
@@ -13,22 +13,22 @@
### END INIT INFO
osafdirfile=@sysconfdir@/@PACKAGE_NAME@/osafdir.conf
-prog="osaflckd"
+osafprog="osaflckd"
initscript=`basename $0`
# Source LSB functions library
. /lib/lsb/init-functions
if [ ! -r $osafdirfile ]; then
- logger -t $prog "can't read $osafdirfile, exiting."
+ logger -t $osafprog "can't read $osafdirfile, exiting."
exit 6
else
. $osafdirfile
. $pkgsysconfdir/lckd.conf
fi
-binary=$pkglibdir/$prog
-pidfile=$pkgpiddir/$prog.pid
+binary=$pkglibdir/$osafprog
+pidfile=$pkgpiddir/$osafprog.pid
lockfile=$lockdir/$initscript
RETVAL=0
@@ -36,7 +36,7 @@ RETVAL=0
start() {
export LD_LIBRARY_PATH=$pkglibdir:$LD_LIBRARY_PATH
[ -x $binary ] || exit 5
- echo -n "Starting $prog: "
+ echo -n "Starting $osafprog: "
start_daemon -p $pidfile $binary $args
RETVAL=$?
if [ $RETVAL -eq 0 ]; then
@@ -49,7 +49,7 @@ start() {
}
stop() {
- echo -n "Stopping $prog: "
+ echo -n "Stopping $osafprog: "
killproc -p $pidfile $binary
RETVAL=$?
if [ $RETVAL -eq 0 ] || [ $RETVAL -eq 7 ]; then
@@ -73,9 +73,9 @@ tryrestart() {
}
reload() {
- echo -n "Reloading $prog: "
+ echo -n "Reloading $osafprog: "
log_warning_msg
- logger -t $prog "reloading configuration is currently an unimplemented
LSB feature"
+ logger -t $osafprog "reloading configuration is currently an
unimplemented LSB feature"
return 3
}
diff --git a/osaf/services/saf/glsv/glnd/scripts/osaf-lcknd.in
b/osaf/services/saf/glsv/glnd/scripts/osaf-lcknd.in
--- a/osaf/services/saf/glsv/glnd/scripts/osaf-lcknd.in
+++ b/osaf/services/saf/glsv/glnd/scripts/osaf-lcknd.in
@@ -13,24 +13,24 @@
### END INIT INFO
osafdirfile=@sysconfdir@/@PACKAGE_NAME@/osafdir.conf
-prog="osaflcknd"
+osafprog="osaflcknd"
initscript=`basename $0`
# Source LSB functions library
. /lib/lsb/init-functions
if [ ! -r $osafdirfile ]; then
- logger -t $prog "can't read $osafdirfile, exiting."
+ logger -t $osafprog "can't read $osafdirfile, exiting."
exit 6
else
. $osafdirfile
. $pkgsysconfdir/lcknd.conf
fi
-binary=$pkglibdir/$prog
-pidfile=$pkgpiddir/$prog.pid
+binary=$pkglibdir/$osafprog
+pidfile=$pkgpiddir/$osafprog.pid
lockfile=$lockdir/$initscript
-termfile=$pkgpiddir/$prog"_termstate"
+termfile=$pkgpiddir/$osafprog"_termstate"
RETVAL=0
@@ -47,7 +47,7 @@ start() {
export LD_LIBRARY_PATH=$pkglibdir:$LD_LIBRARY_PATH
[ -x $binary ] || exit 5
- echo -n "Starting $prog: "
+ echo -n "Starting $osafprog: "
start_daemon -p $pidfile $binary $args
RETVAL=$?
if [ $RETVAL -eq 0 ]; then
@@ -61,7 +61,7 @@ start() {
}
stop() {
- echo -n "Stopping $prog: "
+ echo -n "Stopping $osafprog: "
killproc -p $pidfile $binary
RETVAL=$?
if [ $RETVAL -eq 0 ] || [ $RETVAL -eq 7 ]; then
@@ -86,9 +86,9 @@ tryrestart() {
}
reload() {
- echo -n "Reloading $prog: "
+ echo -n "Reloading $osafprog: "
log_warning_msg
- logger -t $prog "reloading configuration is currently an unimplemented
LSB feature"
+ logger -t $osafprog "reloading configuration is currently an
unimplemented LSB feature"
return 3
}
diff --git a/osaf/services/saf/immsv/immd/scripts/osaf-immd.in
b/osaf/services/saf/immsv/immd/scripts/osaf-immd.in
--- a/osaf/services/saf/immsv/immd/scripts/osaf-immd.in
+++ b/osaf/services/saf/immsv/immd/scripts/osaf-immd.in
@@ -13,14 +13,14 @@
### END INIT INFO
osafdirfile=@sysconfdir@/@PACKAGE_NAME@/osafdir.conf
-prog="osafimmd"
+osafprog="osafimmd"
initscript=`basename $0`
# Source LSB functions library
. /lib/lsb/init-functions
if [ ! -r $osafdirfile ]; then
- logger -t $prog "can't read $osafdirfile, exiting."
+ logger -t $osafprog "can't read $osafdirfile, exiting."
exit 6
else
. $osafdirfile
@@ -28,8 +28,8 @@ else
. $pkgsysconfdir/immd.conf
fi
-binary=$pkglibdir/$prog
-pidfile=$pkgpiddir/$prog.pid
+binary=$pkglibdir/$osafprog
+pidfile=$pkgpiddir/$osafprog.pid
lockfile=$lockdir/$initscript
RETVAL=0
@@ -44,7 +44,7 @@ start() {
exit 5
fi
export IMMD_COMP_NAME_FILE=$COMPNAMEFILE
- echo -n "Starting $prog: "
+ echo -n "Starting $osafprog: "
start_daemon -p $pidfile $binary $args
RETVAL=$?
if [ $RETVAL -eq 0 ]; then
@@ -58,7 +58,7 @@ start() {
}
instantiate() {
- echo -n "AMF Instantiating $prog: "
+ echo -n "AMF Instantiating $osafprog: "
echo $SA_AMF_COMPONENT_NAME > $COMPNAMEFILE
pidofproc -p $pidfile $binary
RETVAL=$?
@@ -78,7 +78,7 @@ instantiate() {
}
stop() {
- echo -n "Stopping $prog: "
+ echo -n "Stopping $osafprog: "
killproc -p $pidfile $binary
RETVAL=$?
if [ $RETVAL -eq 0 ] || [ $RETVAL -eq 7 ]; then
@@ -103,9 +103,9 @@ tryrestart() {
}
reload() {
- echo -n "Reloading $prog: "
+ echo -n "Reloading $osafprog: "
log_warning_msg
- logger -t $prog "reloading configuration is currently an unimplemented
LSB feature"
+ logger -t $osafprog "reloading configuration is currently an
unimplemented LSB feature"
return 3
}
diff --git a/osaf/services/saf/immsv/immnd/scripts/osaf-immnd.in
b/osaf/services/saf/immsv/immnd/scripts/osaf-immnd.in
--- a/osaf/services/saf/immsv/immnd/scripts/osaf-immnd.in
+++ b/osaf/services/saf/immsv/immnd/scripts/osaf-immnd.in
@@ -13,14 +13,14 @@
### END INIT INFO
osafdirfile=@sysconfdir@/@PACKAGE_NAME@/osafdir.conf
-prog="osafimmnd"
+osafprog="osafimmnd"
initscript=`basename $0`
# Source LSB functions library
. /lib/lsb/init-functions
if [ ! -r $osafdirfile ]; then
- logger -t $prog "can't read $osafdirfile, exiting."
+ logger -t $osafprog "can't read $osafdirfile, exiting."
exit 6
else
. $osafdirfile
@@ -28,10 +28,10 @@ else
. $pkgsysconfdir/immnd.conf
fi
-binary=$pkglibdir/$prog
-pidfile=$pkgpiddir/$prog.pid
+binary=$pkglibdir/$osafprog
+pidfile=$pkgpiddir/$osafprog.pid
lockfile=$lockdir/$initscript
-termfile=$pkgpiddir/$prog"_termstate"
+termfile=$pkgpiddir/$osafprog"_termstate"
RETVAL=0
NIDSERV="IMMND"
@@ -49,7 +49,7 @@ start() {
exit 5
fi
export IMMND_COMP_NAME_FILE=$COMPNAMEFILE
- echo -n "Starting $prog: "
+ echo -n "Starting $osafprog: "
start_daemon -p $pidfile $binary $args
RETVAL=$?
if [ $RETVAL -eq 0 ]; then
@@ -73,7 +73,7 @@ instantiate() {
[ -e $termfile ] && killproc -p $pidfile $binary
- echo -n "AMF Instantiating $prog: "
+ echo -n "AMF Instantiating $osafprog: "
echo $SA_AMF_COMPONENT_NAME > $COMPNAMEFILE
pidofproc -p $pidfile $binary
RETVAL=$?
@@ -95,7 +95,7 @@ instantiate() {
}
stop() {
- echo -n "Stopping $prog: "
+ echo -n "Stopping $osafprog: "
/usr/bin/killall osafimmpbed
/usr/bin/killall osafimmloadd
killproc -p $pidfile $binary
@@ -123,9 +123,9 @@ tryrestart() {
}
reload() {
- echo -n "Reloading $prog: "
+ echo -n "Reloading $osafprog: "
log_warning_msg
- logger -t $prog "reloading configuration is currently an unimplemented
LSB feature"
+ logger -t $osafprog "reloading configuration is currently an
unimplemented LSB feature"
return 3
}
diff --git a/osaf/services/saf/logsv/lgs/scripts/osaf-logd.in
b/osaf/services/saf/logsv/lgs/scripts/osaf-logd.in
--- a/osaf/services/saf/logsv/lgs/scripts/osaf-logd.in
+++ b/osaf/services/saf/logsv/lgs/scripts/osaf-logd.in
@@ -13,14 +13,14 @@
### END INIT INFO
osafdirfile=@sysconfdir@/@PACKAGE_NAME@/osafdir.conf
-prog="osaflogd"
+osafprog="osaflogd"
initscript=`basename $0`
# Source LSB functions library
. /lib/lsb/init-functions
if [ ! -r $osafdirfile ]; then
- logger -t $prog "can't read $osafdirfile, exiting."
+ logger -t $osafprog "can't read $osafdirfile, exiting."
exit 6
else
. $osafdirfile
@@ -28,8 +28,8 @@ else
. $pkgsysconfdir/logd.conf
fi
-binary=$pkglibdir/$prog
-pidfile=$pkgpiddir/$prog.pid
+binary=$pkglibdir/$osafprog
+pidfile=$pkgpiddir/$osafprog.pid
lockfile=$lockdir/$initscript
RETVAL=0
@@ -45,7 +45,7 @@ start() {
fi
export LOGD_COMP_NAME_FILE=$COMPNAMEFILE
[ -d $LOGSV_ROOT_DIRECTORY ] || mkdir -p $LOGSV_ROOT_DIRECTORY
- echo -n "Starting $prog: "
+ echo -n "Starting $osafprog: "
start_daemon -p $pidfile $binary $args
RETVAL=$?
if [ $RETVAL -eq 0 ]; then
@@ -59,7 +59,7 @@ start() {
}
instantiate() {
- echo -n "AMF Instantiating $prog: "
+ echo -n "AMF Instantiating $osafprog: "
echo $SA_AMF_COMPONENT_NAME > $COMPNAMEFILE
pidofproc -p $pidfile $binary
RETVAL=$?
@@ -79,7 +79,7 @@ instantiate() {
}
stop() {
- echo -n "Stopping $prog: "
+ echo -n "Stopping $osafprog: "
killproc -p $pidfile $binary
RETVAL=$?
if [ $RETVAL -eq 0 ] || [ $RETVAL -eq 7 ]; then
@@ -104,9 +104,9 @@ tryrestart() {
}
reload() {
- echo -n "Reloading $prog: "
+ echo -n "Reloading $osafprog: "
log_warning_msg
- logger -t $prog "reloading configuration is currently an unimplemented
LSB feature"
+ logger -t $osafprog "reloading configuration is currently an
unimplemented LSB feature"
return 3
}
diff --git a/osaf/services/saf/mqsv/mqd/scripts/osaf-msgd.in
b/osaf/services/saf/mqsv/mqd/scripts/osaf-msgd.in
--- a/osaf/services/saf/mqsv/mqd/scripts/osaf-msgd.in
+++ b/osaf/services/saf/mqsv/mqd/scripts/osaf-msgd.in
@@ -13,22 +13,22 @@
### END INIT INFO
osafdirfile=@sysconfdir@/@PACKAGE_NAME@/osafdir.conf
-prog="osafmsgd"
+osafprog="osafmsgd"
initscript=`basename $0`
# Source LSB functions library
. /lib/lsb/init-functions
if [ ! -r $osafdirfile ]; then
- logger -t $prog "can't read $osafdirfile, exiting."
+ logger -t $osafprog "can't read $osafdirfile, exiting."
exit 6
else
. $osafdirfile
. $pkgsysconfdir/msgd.conf
fi
-binary=$pkglibdir/$prog
-pidfile=$pkgpiddir/$prog.pid
+binary=$pkglibdir/$osafprog
+pidfile=$pkgpiddir/$osafprog.pid
lockfile=$lockdir/$initscript
RETVAL=0
@@ -36,7 +36,7 @@ RETVAL=0
start() {
export LD_LIBRARY_PATH=$pkglibdir:$LD_LIBRARY_PATH
[ -x $binary ] || exit 5
- echo -n "Starting $prog: "
+ echo -n "Starting $osafprog: "
start_daemon -p $pidfile $binary $args
RETVAL=$?
if [ $RETVAL -eq 0 ]; then
@@ -49,7 +49,7 @@ start() {
}
stop() {
- echo -n "Stopping $prog: "
+ echo -n "Stopping $osafprog: "
killproc -p $pidfile $binary
RETVAL=$?
if [ $RETVAL -eq 0 ] || [ $RETVAL -eq 7 ]; then
@@ -73,9 +73,9 @@ tryrestart() {
}
reload() {
- echo -n "Reloading $prog: "
+ echo -n "Reloading $osafprog: "
log_warning_msg
- logger -t $prog "reloading configuration is currently an unimplemented
LSB feature"
+ logger -t $osafprog "reloading configuration is currently an
unimplemented LSB feature"
return 3
}
diff --git a/osaf/services/saf/mqsv/mqnd/scripts/osaf-msgnd.in
b/osaf/services/saf/mqsv/mqnd/scripts/osaf-msgnd.in
--- a/osaf/services/saf/mqsv/mqnd/scripts/osaf-msgnd.in
+++ b/osaf/services/saf/mqsv/mqnd/scripts/osaf-msgnd.in
@@ -13,24 +13,24 @@
### END INIT INFO
osafdirfile=@sysconfdir@/@PACKAGE_NAME@/osafdir.conf
-prog="osafmsgnd"
+osafprog="osafmsgnd"
initscript=`basename $0`
# Source LSB functions library
. /lib/lsb/init-functions
if [ ! -r $osafdirfile ]; then
- logger -t $prog "can't read $osafdirfile, exiting."
+ logger -t $osafprog "can't read $osafdirfile, exiting."
exit 6
else
. $osafdirfile
. $pkgsysconfdir/msgnd.conf
fi
-binary=$pkglibdir/$prog
-pidfile=$pkgpiddir/$prog.pid
+binary=$pkglibdir/$osafprog
+pidfile=$pkgpiddir/$osafprog.pid
lockfile=$lockdir/$initscript
-termfile=$pkgpiddir/$prog"_termstate"
+termfile=$pkgpiddir/$osafprog"_termstate"
RETVAL=0
@@ -47,7 +47,7 @@ start() {
export LD_LIBRARY_PATH=$pkglibdir:$LD_LIBRARY_PATH
[ -x $binary ] || exit 5
- echo -n "Starting $prog: "
+ echo -n "Starting $osafprog: "
start_daemon -p $pidfile $binary $args
RETVAL=$?
if [ $RETVAL -eq 0 ]; then
@@ -61,7 +61,7 @@ start() {
}
stop() {
- echo -n "Stopping $prog: "
+ echo -n "Stopping $osafprog: "
killproc -p $pidfile $binary
RETVAL=$?
if [ $RETVAL -eq 0 ] || [ $RETVAL -eq 7 ]; then
@@ -86,9 +86,9 @@ tryrestart() {
}
reload() {
- echo -n "Reloading $prog: "
+ echo -n "Reloading $osafprog: "
log_warning_msg
- logger -t $prog "reloading configuration is currently an unimplemented
LSB feature"
+ logger -t $osafprog "reloading configuration is currently an
unimplemented LSB feature"
return 3
}
diff --git a/osaf/services/saf/ntfsv/ntfs/scripts/osaf-ntfd.in
b/osaf/services/saf/ntfsv/ntfs/scripts/osaf-ntfd.in
--- a/osaf/services/saf/ntfsv/ntfs/scripts/osaf-ntfd.in
+++ b/osaf/services/saf/ntfsv/ntfs/scripts/osaf-ntfd.in
@@ -13,14 +13,14 @@
### END INIT INFO
osafdirfile=@sysconfdir@/@PACKAGE_NAME@/osafdir.conf
-prog="osafntfd"
+osafprog="osafntfd"
initscript=`basename $0`
# Source LSB functions library
. /lib/lsb/init-functions
if [ ! -r $osafdirfile ]; then
- logger -t $prog "can't read $osafdirfile, exiting."
+ logger -t $osafprog "can't read $osafdirfile, exiting."
exit 6
else
. $osafdirfile
@@ -28,8 +28,8 @@ else
. $pkgsysconfdir/ntfd.conf
fi
-binary=$pkglibdir/$prog
-pidfile=$pkgpiddir/$prog.pid
+binary=$pkglibdir/$osafprog
+pidfile=$pkgpiddir/$osafprog.pid
lockfile=$lockdir/$initscript
RETVAL=0
@@ -43,7 +43,7 @@ start() {
exit 5
fi
export NTFD_COMP_NAME_FILE=$COMPNAMEFILE
- echo -n "Starting $prog: "
+ echo -n "Starting $osafprog: "
start_daemon -p $pidfile $binary $args
RETVAL=$?
if [ $RETVAL -eq 0 ]; then
@@ -57,7 +57,7 @@ start() {
}
instantiate() {
- echo -n "AMF Instantiating $prog: "
+ echo -n "AMF Instantiating $osafprog: "
echo $SA_AMF_COMPONENT_NAME > $COMPNAMEFILE
pidofproc -p $pidfile $binary
RETVAL=$?
@@ -77,7 +77,7 @@ instantiate() {
}
stop() {
- echo -n "Stopping $prog: "
+ echo -n "Stopping $osafprog: "
killproc -p $pidfile $binary
RETVAL=$?
killall osafntfimcnd
@@ -103,9 +103,9 @@ tryrestart() {
}
reload() {
- echo -n "Reloading $prog: "
+ echo -n "Reloading $osafprog: "
log_warning_msg
- logger -t $prog "reloading configuration is currently an unimplemented
LSB feature"
+ logger -t $osafprog "reloading configuration is currently an
unimplemented LSB feature"
return 3
}
diff --git a/osaf/services/saf/plmsv/plms/scripts/osaf-plmd.in
b/osaf/services/saf/plmsv/plms/scripts/osaf-plmd.in
--- a/osaf/services/saf/plmsv/plms/scripts/osaf-plmd.in
+++ b/osaf/services/saf/plmsv/plms/scripts/osaf-plmd.in
@@ -13,14 +13,14 @@
### END INIT INFO
osafdirfile=@sysconfdir@/@PACKAGE_NAME@/osafdir.conf
-prog="osafplmd"
+osafprog="osafplmd"
initscript=`basename $0`
# Source LSB functions library
. /lib/lsb/init-functions
if [ ! -r $osafdirfile ]; then
- logger -t $prog "can't read $osafdirfile, exiting."
+ logger -t $osafprog "can't read $osafdirfile, exiting."
exit 6
else
. $osafdirfile
@@ -28,8 +28,8 @@ else
. $pkgsysconfdir/plmd.conf
fi
-binary=$pkglibdir/$prog
-pidfile=$pkgpiddir/$prog.pid
+binary=$pkglibdir/$osafprog
+pidfile=$pkgpiddir/$osafprog.pid
lockfile=$lockdir/$initscript
RETVAL=0
@@ -44,7 +44,7 @@ start() {
exit 5
fi
export PLMD_COMP_NAME_FILE=$COMPNAMEFILE
- echo -n "Starting $prog: "
+ echo -n "Starting $osafprog: "
start_daemon -p $pidfile $binary $args
RETVAL=$?
if [ $RETVAL -eq 0 ]; then
@@ -58,7 +58,7 @@ start() {
}
instantiate() {
- echo -n "AMF Instantiating $prog: "
+ echo -n "AMF Instantiating $osafprog: "
echo $SA_AMF_COMPONENT_NAME > $COMPNAMEFILE
pidofproc -p $pidfile $binary
RETVAL=$?
@@ -78,7 +78,7 @@ instantiate() {
}
stop() {
- echo -n "Stopping $prog: "
+ echo -n "Stopping $osafprog: "
killproc -p $pidfile $binary
RETVAL=$?
if [ $RETVAL -eq 0 ] || [ $RETVAL -eq 7 ]; then
@@ -103,9 +103,9 @@ tryrestart() {
}
reload() {
- echo -n "Reloading $prog: "
+ echo -n "Reloading $osafprog: "
log_warning_msg
- logger -t $prog "reloading configuration is currently an unimplemented
LSB feature"
+ logger -t $osafprog "reloading configuration is currently an
unimplemented LSB feature"
return 3
}
diff --git a/osaf/services/saf/smfsv/smfd/scripts/osaf-smfd.in
b/osaf/services/saf/smfsv/smfd/scripts/osaf-smfd.in
--- a/osaf/services/saf/smfsv/smfd/scripts/osaf-smfd.in
+++ b/osaf/services/saf/smfsv/smfd/scripts/osaf-smfd.in
@@ -13,22 +13,22 @@
### END INIT INFO
osafdirfile=@sysconfdir@/@PACKAGE_NAME@/osafdir.conf
-prog="osafsmfd"
+osafprog="osafsmfd"
initscript=`basename $0`
# Source LSB functions library
. /lib/lsb/init-functions
if [ ! -r $osafdirfile ]; then
- logger -t $prog "can't read $osafdirfile, exiting."
+ logger -t $osafprog "can't read $osafdirfile, exiting."
exit 6
else
. $osafdirfile
. $pkgsysconfdir/smfd.conf
fi
-binary=$pkglibdir/$prog
-pidfile=$pkgpiddir/$prog.pid
+binary=$pkglibdir/$osafprog
+pidfile=$pkgpiddir/$osafprog.pid
lockfile=$lockdir/$initscript
RETVAL=0
@@ -36,7 +36,7 @@ RETVAL=0
start() {
export LD_LIBRARY_PATH=$pkglibdir:$LD_LIBRARY_PATH
[ -x $binary ] || exit 5
- echo -n "Starting $prog: "
+ echo -n "Starting $osafprog: "
start_daemon -p $pidfile $binary $args
RETVAL=$?
if [ $RETVAL -eq 0 ]; then
@@ -49,7 +49,7 @@ start() {
}
stop() {
- echo -n "Stopping $prog: "
+ echo -n "Stopping $osafprog: "
killproc -p $pidfile $binary
RETVAL=$?
if [ $RETVAL -eq 0 ] || [ $RETVAL -eq 7 ]; then
@@ -73,9 +73,9 @@ tryrestart() {
}
reload() {
- echo -n "Reloading $prog: "
+ echo -n "Reloading $osafprog: "
log_warning_msg
- logger -t $prog "reloading configuration is currently an unimplemented
LSB feature"
+ logger -t $osafprog "reloading configuration is currently an
unimplemented LSB feature"
return 3
}
diff --git a/osaf/services/saf/smfsv/smfnd/scripts/osaf-smfnd.in
b/osaf/services/saf/smfsv/smfnd/scripts/osaf-smfnd.in
--- a/osaf/services/saf/smfsv/smfnd/scripts/osaf-smfnd.in
+++ b/osaf/services/saf/smfsv/smfnd/scripts/osaf-smfnd.in
@@ -13,24 +13,24 @@
### END INIT INFO
osafdirfile=@sysconfdir@/@PACKAGE_NAME@/osafdir.conf
-prog="osafsmfnd"
+osafprog="osafsmfnd"
initscript=`basename $0`
# Source LSB functions library
. /lib/lsb/init-functions
if [ ! -r $osafdirfile ]; then
- logger -t $prog "can't read $osafdirfile, exiting."
+ logger -t $osafprog "can't read $osafdirfile, exiting."
exit 6
else
. $osafdirfile
. $pkgsysconfdir/smfnd.conf
fi
-binary=$pkglibdir/$prog
-pidfile=$pkgpiddir/$prog.pid
+binary=$pkglibdir/$osafprog
+pidfile=$pkgpiddir/$osafprog.pid
lockfile=$lockdir/$initscript
-termfile=$pkgpiddir/$prog"_termstate"
+termfile=$pkgpiddir/$osafprog"_termstate"
RETVAL=0
@@ -47,7 +47,7 @@ start() {
export LD_LIBRARY_PATH=$pkglibdir:$LD_LIBRARY_PATH
[ -x $binary ] || exit 5
- echo -n "Starting $prog: "
+ echo -n "Starting $osafprog: "
start_daemon -p $pidfile $binary $args
RETVAL=$?
if [ $RETVAL -eq 0 ]; then
@@ -61,7 +61,7 @@ start() {
}
stop() {
- echo -n "Stopping $prog: "
+ echo -n "Stopping $osafprog: "
killproc -p $pidfile $binary
RETVAL=$?
if [ $RETVAL -eq 0 ] || [ $RETVAL -eq 7 ]; then
@@ -86,9 +86,9 @@ tryrestart() {
}
reload() {
- echo -n "Reloading $prog: "
+ echo -n "Reloading $osafprog: "
log_warning_msg
- logger -t $prog "reloading configuration is currently an unimplemented
LSB feature"
+ logger -t $osafprog "reloading configuration is currently an
unimplemented LSB feature"
return 3
}
------------------------------------------------------------------------------
What NetFlow Analyzer can do for you? Monitors network bandwidth and traffic
patterns at an interface-level. Reveals which users, apps, and protocols are
consuming the most bandwidth. Provides multi-vendor support for NetFlow,
J-Flow, sFlow and other flows. Make informed decisions using capacity planning
reports.http://sdm.link/zohodev2dev
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
