From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 4 Mar 2013 14:22:08 +0000 (+0100)
Subject: Revert "outgoingfw: Use local timezone for time rules."
X-Git-Tag: v2.13-core67~5^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=624120beed20047dcf35b4975566a21a874bb8b2;p=people%2Fms%2Fipfire-2.x.git

Revert "outgoingfw: Use local timezone for time rules."

This reverts commit 21ef1f15f6807277b756f5be4dd6f320c665a74c.

This has no effect as the kernel usually runs in UTC. If --kerneltz
is missing, UTC will be used as well.
---

diff --git a/config/outgoingfw/outgoingfw.pl b/config/outgoingfw/outgoingfw.pl
index 19ae414141..7dd14303a1 100644
--- a/config/outgoingfw/outgoingfw.pl
+++ b/config/outgoingfw/outgoingfw.pl
@@ -214,7 +214,7 @@ foreach $configentry (sort @configs)
 					if ($configline[14]){$DAY .= "Fri,"}
 					if ($configline[15]){$DAY .= "Sat,"}
 					if ($configline[16]){$DAY .= "Sun"}
-					$CMD = "$CMD -m time --kerneltz --timestart $configline[17] --timestop $configline[18] --weekdays $DAY";
+					$CMD = "$CMD -m time --timestart $configline[17] --timestop $configline[18] --weekdays $DAY";
 				}
 
 				$CMD = "$CMD -o $netsettings{'RED_DEV'}";
diff --git a/config/rootfiles/core/67/filelists/files b/config/rootfiles/core/67/filelists/files
index c9c032d734..4a3c2e3be5 100644
--- a/config/rootfiles/core/67/filelists/files
+++ b/config/rootfiles/core/67/filelists/files
@@ -9,4 +9,3 @@ srv/web/ipfire/html/images/updbooster/updxl-src-microsoft.gif
 srv/web/ipfire/html/images/updbooster/updxl-src-windows.gif
 usr/sbin/updxlrator
 var/ipfire/langs
-var/ipfire/outgoing/bin/outgoingfw.pl