From 2d749f0b6647a1a99bea5fc866bc19a550c2fc71 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 1 Oct 2015 11:46:51 -0400 Subject: [PATCH 1/2] Setting the TZ ENV variable prevents every gettimeofday call from reading /etc/timezone --- distros/debian/init.d | 1 + distros/debian_cmake/init.d | 1 + distros/ubuntu1204/init.d | 1 + distros/ubuntu1204_cmake/zoneminder.init | 1 + 4 files changed, 4 insertions(+) diff --git a/distros/debian/init.d b/distros/debian/init.d index d3354c1d8..f22143c38 100644 --- a/distros/debian/init.d +++ b/distros/debian/init.d @@ -23,6 +23,7 @@ command="$ZM_PATH_BIN/zmpkg.pl" start() { echo -n "Starting $prog: " + export TZ=:/etc/localtime mkdir -p $RUNDIR && chown www-data:www-data $RUNDIR mkdir -p $TMPDIR && chown www-data:www-data $TMPDIR $command start diff --git a/distros/debian_cmake/init.d b/distros/debian_cmake/init.d index cbc8fb10e..036bb695d 100644 --- a/distros/debian_cmake/init.d +++ b/distros/debian_cmake/init.d @@ -23,6 +23,7 @@ command="$ZM_PATH_BIN/zmpkg.pl" start() { echo -n "Starting $prog: " + export TZ=:/etc/localtime mkdir -p $RUNDIR $TMPDIR && chown www-data:www-data $RUNDIR $TMPDIR $command start RETVAL=$? diff --git a/distros/ubuntu1204/init.d b/distros/ubuntu1204/init.d index d3354c1d8..f22143c38 100644 --- a/distros/ubuntu1204/init.d +++ b/distros/ubuntu1204/init.d @@ -23,6 +23,7 @@ command="$ZM_PATH_BIN/zmpkg.pl" start() { echo -n "Starting $prog: " + export TZ=:/etc/localtime mkdir -p $RUNDIR && chown www-data:www-data $RUNDIR mkdir -p $TMPDIR && chown www-data:www-data $TMPDIR $command start diff --git a/distros/ubuntu1204_cmake/zoneminder.init b/distros/ubuntu1204_cmake/zoneminder.init index 88de7cef9..5cdf62165 100644 --- a/distros/ubuntu1204_cmake/zoneminder.init +++ b/distros/ubuntu1204_cmake/zoneminder.init @@ -23,6 +23,7 @@ command="$ZM_PATH_BIN/zmpkg.pl" start() { echo -n "Starting $prog: " + export TZ=:/etc/localtime mkdir -p "$RUNDIR" && chown www-data:www-data "$RUNDIR" mkdir -p "$TMPDIR" && chown www-data:www-data "$TMPDIR" $command start From c9d7087c915b16ddcd792bd894554cf90f4832f1 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 1 Oct 2015 11:47:12 -0400 Subject: [PATCH 2/2] Setting the TZ ENV variable prevents every gettimeofday call from reading /etc/timezone --- distros/ubuntu1504_cmake/zoneminder.init | 1 + .../zoneminder-core.zoneminder.init | 1 + 2 files changed, 2 insertions(+) diff --git a/distros/ubuntu1504_cmake/zoneminder.init b/distros/ubuntu1504_cmake/zoneminder.init index 88de7cef9..5cdf62165 100644 --- a/distros/ubuntu1504_cmake/zoneminder.init +++ b/distros/ubuntu1504_cmake/zoneminder.init @@ -23,6 +23,7 @@ command="$ZM_PATH_BIN/zmpkg.pl" start() { echo -n "Starting $prog: " + export TZ=:/etc/localtime mkdir -p "$RUNDIR" && chown www-data:www-data "$RUNDIR" mkdir -p "$TMPDIR" && chown www-data:www-data "$TMPDIR" $command start diff --git a/distros/ubuntu1504_cmake_split_packages/zoneminder-core.zoneminder.init b/distros/ubuntu1504_cmake_split_packages/zoneminder-core.zoneminder.init index d3354c1d8..f22143c38 100644 --- a/distros/ubuntu1504_cmake_split_packages/zoneminder-core.zoneminder.init +++ b/distros/ubuntu1504_cmake_split_packages/zoneminder-core.zoneminder.init @@ -23,6 +23,7 @@ command="$ZM_PATH_BIN/zmpkg.pl" start() { echo -n "Starting $prog: " + export TZ=:/etc/localtime mkdir -p $RUNDIR && chown www-data:www-data $RUNDIR mkdir -p $TMPDIR && chown www-data:www-data $TMPDIR $command start