add the glue to define HOST_OS and use it to detect BSD and use different arguments to killall
This commit is contained in:
parent
623837115b
commit
c58c4a9720
28
configure.ac
28
configure.ac
|
@ -386,6 +386,34 @@ fi
|
||||||
AC_SUBST(PERL_MM_PARMS)
|
AC_SUBST(PERL_MM_PARMS)
|
||||||
AC_SUBST(EXTRA_PERL_LIB)
|
AC_SUBST(EXTRA_PERL_LIB)
|
||||||
|
|
||||||
|
#
|
||||||
|
# Platform specific setup
|
||||||
|
#
|
||||||
|
#############################
|
||||||
|
AC_CANONICAL_HOST
|
||||||
|
# Check for which host we are on and setup a few things
|
||||||
|
# specifically based on the host
|
||||||
|
case $host_os in
|
||||||
|
darwin* )
|
||||||
|
# Do something specific for mac
|
||||||
|
HOST_OS='darwin'
|
||||||
|
;;
|
||||||
|
linux*)
|
||||||
|
# Do something specific for linux
|
||||||
|
HOST_OS='linux'
|
||||||
|
;;
|
||||||
|
*BSD*)
|
||||||
|
# Do something specific for BSD
|
||||||
|
HOST_OS='BSD'
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
#Default Case
|
||||||
|
AC_MSG_ERROR([Your platform is not currently supported])
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
AC_SUBST(HOST_OS)
|
||||||
|
|
||||||
AC_CONFIG_FILES([Makefile zm.conf zmconfgen.pl db/Makefile db/zm_create.sql misc/Makefile misc/apache.conf misc/logrotate.conf misc/syslog.conf scripts/Makefile scripts/zm scripts/zmaudit.pl scripts/zmcontrol.pl scripts/zmdc.pl scripts/zmfilter.pl scripts/zmpkg.pl scripts/zmtrack.pl scripts/zmcamtool.pl scripts/zmtrigger.pl scripts/zmupdate.pl scripts/zmvideo.pl scripts/zmwatch.pl scripts/zmx10.pl scripts/zmdbbackup scripts/zmdbrestore scripts/zmeventdump scripts/zmlogrotate.conf scripts/ZoneMinder/lib/ZoneMinder/Base.pm scripts/ZoneMinder/lib/ZoneMinder/Config.pm scripts/ZoneMinder/lib/ZoneMinder/Memory.pm scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm src/Makefile src/zm_config.h web/Makefile web/ajax/Makefile web/css/Makefile web/graphics/Makefile web/includes/Makefile web/includes/config.php web/js/Makefile web/lang/Makefile web/skins/Makefile web/skins/classic/Makefile web/skins/classic/ajax/Makefile web/skins/classic/css/Makefile web/skins/classic/graphics/Makefile web/skins/classic/includes/Makefile web/skins/classic/js/Makefile web/skins/classic/lang/Makefile web/skins/classic/views/Makefile web/skins/classic/views/css/Makefile web/skins/classic/views/js/Makefile web/skins/mobile/Makefile web/skins/mobile/ajax/Makefile web/skins/mobile/css/Makefile web/skins/mobile/graphics/Makefile web/skins/mobile/includes/Makefile web/skins/mobile/lang/Makefile web/skins/mobile/views/Makefile web/skins/mobile/views/css/Makefile web/tools/Makefile web/tools/mootools/Makefile web/views/Makefile web/skins/xml/Makefile web/skins/xml/views/Makefile web/skins/xml/includes/Makefile web/skins/flat/Makefile web/skins/flat/ajax/Makefile web/skins/flat/css/Makefile web/skins/flat/graphics/Makefile web/skins/flat/includes/Makefile web/skins/flat/js/Makefile web/skins/flat/lang/Makefile web/skins/flat/views/Makefile web/skins/flat/views/css/Makefile web/skins/flat/views/js/Makefile])
|
AC_CONFIG_FILES([Makefile zm.conf zmconfgen.pl db/Makefile db/zm_create.sql misc/Makefile misc/apache.conf misc/logrotate.conf misc/syslog.conf scripts/Makefile scripts/zm scripts/zmaudit.pl scripts/zmcontrol.pl scripts/zmdc.pl scripts/zmfilter.pl scripts/zmpkg.pl scripts/zmtrack.pl scripts/zmcamtool.pl scripts/zmtrigger.pl scripts/zmupdate.pl scripts/zmvideo.pl scripts/zmwatch.pl scripts/zmx10.pl scripts/zmdbbackup scripts/zmdbrestore scripts/zmeventdump scripts/zmlogrotate.conf scripts/ZoneMinder/lib/ZoneMinder/Base.pm scripts/ZoneMinder/lib/ZoneMinder/Config.pm scripts/ZoneMinder/lib/ZoneMinder/Memory.pm scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm src/Makefile src/zm_config.h web/Makefile web/ajax/Makefile web/css/Makefile web/graphics/Makefile web/includes/Makefile web/includes/config.php web/js/Makefile web/lang/Makefile web/skins/Makefile web/skins/classic/Makefile web/skins/classic/ajax/Makefile web/skins/classic/css/Makefile web/skins/classic/graphics/Makefile web/skins/classic/includes/Makefile web/skins/classic/js/Makefile web/skins/classic/lang/Makefile web/skins/classic/views/Makefile web/skins/classic/views/css/Makefile web/skins/classic/views/js/Makefile web/skins/mobile/Makefile web/skins/mobile/ajax/Makefile web/skins/mobile/css/Makefile web/skins/mobile/graphics/Makefile web/skins/mobile/includes/Makefile web/skins/mobile/lang/Makefile web/skins/mobile/views/Makefile web/skins/mobile/views/css/Makefile web/tools/Makefile web/tools/mootools/Makefile web/views/Makefile web/skins/xml/Makefile web/skins/xml/views/Makefile web/skins/xml/includes/Makefile web/skins/flat/Makefile web/skins/flat/ajax/Makefile web/skins/flat/css/Makefile web/skins/flat/graphics/Makefile web/skins/flat/includes/Makefile web/skins/flat/js/Makefile web/skins/flat/lang/Makefile web/skins/flat/views/Makefile web/skins/flat/views/css/Makefile web/skins/flat/views/js/Makefile])
|
||||||
|
|
||||||
# Create the definitions for compilation and defaults for the database
|
# Create the definitions for compilation and defaults for the database
|
||||||
|
|
|
@ -782,16 +782,22 @@ sub killAll
|
||||||
{
|
{
|
||||||
my $delay = shift;
|
my $delay = shift;
|
||||||
sleep( $delay );
|
sleep( $delay );
|
||||||
|
my $killall;
|
||||||
|
if ( '@HOST_OS@' eq 'BSD' ) {
|
||||||
|
$killall = 'killall -';
|
||||||
|
} else {
|
||||||
|
$killall = 'killall -q -s ';
|
||||||
|
}
|
||||||
|
foreach my $daemon ( @daemons ) {
|
||||||
|
|
||||||
|
my $cmd = $killall ."TERM $daemon";
|
||||||
|
Debug( $cmd );
|
||||||
|
qx( $cmd );
|
||||||
|
}
|
||||||
|
sleep( $delay );
|
||||||
foreach my $daemon ( @daemons )
|
foreach my $daemon ( @daemons )
|
||||||
{
|
{
|
||||||
my $cmd = "killall --quiet --signal TERM $daemon";
|
my $cmd = $killall."KILL $daemon";
|
||||||
Debug( $cmd );
|
|
||||||
qx( $cmd );
|
|
||||||
}
|
|
||||||
sleep( $delay );
|
|
||||||
foreach my $daemon ( @daemons )
|
|
||||||
{
|
|
||||||
my $cmd = "killall --quiet --signal KILL $daemon";
|
|
||||||
Debug( $cmd );
|
Debug( $cmd );
|
||||||
qx( $cmd );
|
qx( $cmd );
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue