From 624120beed20047dcf35b4975566a21a874bb8b2 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 4 Mar 2013 15:22:08 +0100 Subject: [PATCH] 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. --- config/outgoingfw/outgoingfw.pl | 2 +- config/rootfiles/core/67/filelists/files | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) 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 -- 2.39.5