1 files changed, 9 insertions, 8 deletions

diff --git a/apt-panopticommon.lua b/apt-panopticommon.lua
index 982ff21..22d294a 100644
--- a/apt-panopticommon.lua
+++ b/apt-panopticommon.lua
@@ -8,13 +8,14 @@ APT.version = '0.3 alpha'
 APT.protocols = {"ftp", "http", "https", "rsync"}
 APT.tests = {'raw', 'Integrity', 'Protocol', 'Redirects', 'Updated', 'URLSanity', 'Speed'}
 --APT.releases = {"jessie", "ascii", "beowulf", "chimaera", "daedalus", "ceres"}
-APT.releases = {"beowulf","chimaera", "daedalus", "excalibur", "ceres"}
+APT.releases = {"chimaera", "daedalus", "excalibur", "freia", "ceres"}
 APT.subRels = {'backports', 'proposed-updates', 'security', 'updates'}
 APT.notExist =
 {
-    'excalibur-backports',
-    'excalibur-security',
-    'excalibur-updates',
+    'chimaera-backports',
+    'freia-backports',
+    'freia-security',
+    'freia-updates',
     'ceres-backports',          -- These will never exist, it's our code name for the testing suite.
     'ceres-proposed-updates',
     'ceres-updates',
@@ -84,13 +85,13 @@ APT.options =
         {
             typ = "number",
             help = "",
-            value = 240,
+            value = 180,
         },
     timeout =
         {
             typ = "number",
             help = "",
-            value = 24,
+            value = 42,
         },
     timeouts =
         {
@@ -550,9 +551,9 @@ APT.exe = function(c)
         -- timeout returns a status of - command status if --preserve-status; "128+9" (actually 137) if --kill-after ends up being done; 124 if it had to TERM; command status if all went well.
         -- --kill-after means "send KILL after TERM fails.
         if nil == c then
-            self.cmd = 'timeout --kill-after=10.0 --foreground 42.0s ' .. self.cmd
+            self.cmd = 'timeout --kill-after=10.0s --foreground 42.0s ' .. self.cmd
         else
-            self.cmd = 'timeout --kill-after=10.0 --foreground ' .. c .. ' ' .. self.cmd
+            self.cmd = 'timeout --kill-after=10.0s --foreground ' .. c .. ' ' .. self.cmd
         end
         return self
     end