Merge remote-tracking branch 'ms/timezone-transision' into next

diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2
index a7966241613ed64194a2e5845e0c99c83deddccf..45aaa8a7d950d70dcbb82e33477d2007ae697192 100644 (file)
--- a/config/rootfiles/common/stage2
+++ b/config/rootfiles/common/stage2
@@ -94,6 +94,7 @@ usr/local/bin/scanhd
 usr/local/bin/setddns.pl
 usr/local/bin/settime
 usr/local/bin/timecheck
+use/local/bin/timezone-transition
 #usr/local/bin/uname
 usr/local/bin/update-lang-cache
 #usr/local/include

diff --git a/src/scripts/timezone-transition b/src/scripts/timezone-transition
new file mode 100644 (file)
index 0000000..a8e436f
--- /dev/null
+++ b/src/scripts/timezone-transition
@@ -0,0 +1,37 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire is free software; you can redistribute it and/or modify           #
+# it under the terms of the GNU General Public License as published by     #
+# the Free Software Foundation; either version 2 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire is distributed in the hope that it will be useful,                #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU General Public License for more details.                             #
+#                                                                          #
+# You should have received a copy of the GNU General Public License        #
+# along with IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2014 IPFire Team <info@ipfire.org>                         #
+#                                                                          #
+############################################################################
+
+# This script checks if a daylight saving time transition
+# has just happened and will run the given command.
+
+HOUR_NOW=$(date "+%H")
+HOUR_THEN=$(date --date="1 hour ago" "+%H")
+
+# We expect that the result in HOUR_THEN is HOUR_NOW - 1
+HOUR_EXPECTED=$(( ${HOUR_NOW} - 1 ))
+
+if [ "${HOUR_EXPECTED}" -eq "${HOUR_THEN}" ]; then
+       exit 0
+fi
+
+$@