From ee537501e4de09ab39ddfb11388886a8aa37a75c Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 18 Dec 2013 17:54:33 +0100
Subject: ship:remaster_arch_iso using xorriso instead of genisofs

---
 ship/src/remaster_arch_iso | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/ship/src/remaster_arch_iso b/ship/src/remaster_arch_iso
index 66d5bc05..cb090bbd 100755
--- a/ship/src/remaster_arch_iso
+++ b/ship/src/remaster_arch_iso
@@ -87,8 +87,22 @@ EOF
 done
 
 info "creating Iso Image"
-genisoimage -l -r -J -V "ARCH_$(date +%Y%m)" \
-    -b isolinux/isolinux.bin -no-emul-boot \
-    -boot-load-size 4 -boot-info-table -c isolinux/boot.cat \
-    -o "$outdir/$outfile" "$isodir" 
+#genisoimage -l -r -J -V "ARCH_$(date +%Y%m)" \
+#    -b isolinux/isolinux.bin -no-emul-boot \
+#    -boot-load-size 4 -boot-info-table -c isolinux/boot.cat \
+#    -o "$outdir/$outfile" "$isodir" 
+rm -f "${outdir}/${outfile}"
+xorriso -as mkisofs \
+    -iso-level 3 \
+    -full-iso9660-filenames \
+    -volid "ARCH_201311" \
+    -appid "Shackspace Krebs Installer" \
+    -publisher "Shackspace/Krebs" \
+    -preparer "prepared by krebs" \
+    -eltorito-boot isolinux/isolinux.bin \
+    -eltorito-catalog isolinux/boot.cat \
+    -no-emul-boot -boot-load-size 4 -boot-info-table \
+    -isohybrid-mbr ${isomnt}/isolinux/isohdpfx.bin \
+    -output "${outdir}/${outfile}" \
+    "$isodir"
 
-- 
cgit v1.2.3


From 2303fb11a12715aaefcf227172c437cc0e6da9cf Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@googlemail.com>
Date: Wed, 18 Dec 2013 17:58:05 +0100
Subject: Reaktor/IRC: reading kill_timeout from config

---
 Reaktor/IRC/asybot.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Reaktor/IRC/asybot.py b/Reaktor/IRC/asybot.py
index 6d19fd09..31af28d2 100755
--- a/Reaktor/IRC/asybot.py
+++ b/Reaktor/IRC/asybot.py
@@ -54,7 +54,7 @@ class asybot(asychat):
     # passed without a message.  Any incoming message will reset alarm.
     self.alarm_timeout = getconf('irc_alarm_timeout')
     self.hammer_interval = getconf('irc_hammer_interval')
-    self.kill_timeout = 360
+    self.kill_timeout = getconf('irc_kill_timeout')
     signal(SIGALRM, lambda signum, frame: self.alarm_handler())
     self.reset_alarm()
 
-- 
cgit v1.2.3


From 9c04a22503d01763424db7119a3206c89b43cd78 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@googlemail.com>
Date: Wed, 18 Dec 2013 17:58:40 +0100
Subject: Reaktor/IRC: match only one pattern

---
 Reaktor/IRC/asybot.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Reaktor/IRC/asybot.py b/Reaktor/IRC/asybot.py
index 31af28d2..89967c3f 100755
--- a/Reaktor/IRC/asybot.py
+++ b/Reaktor/IRC/asybot.py
@@ -129,6 +129,7 @@ class asybot(asychat):
       y = match(command['pattern'], rest)
       if y:
         self.execute_command(command, y, PRIVMSG, ME)
+        break
 
   def execute_command(self, command, match, PRIVMSG, ME):
     from os.path import realpath, dirname, join
-- 
cgit v1.2.3


From cb8b66260b1230f86521308e66c7ef96cf54095a Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@googlemail.com>
Date: Wed, 18 Dec 2013 18:01:35 +0100
Subject: Reaktor/IRC: removed TODO, unsolvable

---
 Reaktor/TODO | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Reaktor/TODO b/Reaktor/TODO
index 6dbc2f8d..f8958b7f 100644
--- a/Reaktor/TODO
+++ b/Reaktor/TODO
@@ -1,6 +1,5 @@
 { "pattern": "^(?:asybot|\\*):.*", "argv": [ "commands/say", "{{from.nickname}}: you are made of stupid" ], only_match: true }
 
-getconf: check syntax and semantics on load
 getconf: reload inotify
 
 apropros caps: commands need access to config
-- 
cgit v1.2.3


From 6ab529502210751f89c832558e2db26c2ade36ab Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@googlemail.com>
Date: Wed, 18 Dec 2013 18:02:36 +0100
Subject: Reaktor/IRC: TODO done

---
 Reaktor/TODO | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Reaktor/TODO b/Reaktor/TODO
index f8958b7f..782a7248 100644
--- a/Reaktor/TODO
+++ b/Reaktor/TODO
@@ -1,5 +1,3 @@
-{ "pattern": "^(?:asybot|\\*):.*", "argv": [ "commands/say", "{{from.nickname}}: you are made of stupid" ], only_match: true }
-
 getconf: reload inotify
 
 apropros caps: commands need access to config
-- 
cgit v1.2.3