From ef2a1f113b0240515982bf1e7525b26f6b9577b2 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 26 Mar 2014 03:15:37 +0100
Subject: filehooker: add io command,

also add vsftpd to packages and minor fixes
---
 filehooker/build.sh                                 | 2 +-
 filehooker/packages.both                            | 2 ++
 filehooker/root-image/krebs/etc/Reaktor/commands/io | 0
 filehooker/root-image/krebs/etc/Reaktor/config.py   | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 filehooker/root-image/krebs/etc/Reaktor/commands/io

(limited to 'filehooker')

diff --git a/filehooker/build.sh b/filehooker/build.sh
index 6a46a8dc..671b15b5 100755
--- a/filehooker/build.sh
+++ b/filehooker/build.sh
@@ -203,7 +203,7 @@ make_prepare() {
 # Build ISO
 make_iso() {
     mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" checksum
-    mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -o "${out_dir}" iso "${iso_name}-${iso_version}-dual.iso"
+    mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -o "${out_dir}" iso "${iso_name}.iso"
 }
 
 if [[ ${EUID} -ne 0 ]]; then
diff --git a/filehooker/packages.both b/filehooker/packages.both
index a1b73794..03bcc123 100644
--- a/filehooker/packages.both
+++ b/filehooker/packages.both
@@ -1,5 +1,7 @@
 arch-install-scripts
 python
+mlocate
+vsftpd
 btrfs-progs
 lftp
 haveged
diff --git a/filehooker/root-image/krebs/etc/Reaktor/commands/io b/filehooker/root-image/krebs/etc/Reaktor/commands/io
old mode 100644
new mode 100755
diff --git a/filehooker/root-image/krebs/etc/Reaktor/config.py b/filehooker/root-image/krebs/etc/Reaktor/config.py
index 92ef6433..bc19dafc 100644
--- a/filehooker/root-image/krebs/etc/Reaktor/config.py
+++ b/filehooker/root-image/krebs/etc/Reaktor/config.py
@@ -31,6 +31,7 @@ public_commands = [
   default_command('list_downloads'),
   default_command('badcommand'),
   default_command('rev'),
+  default_command('io'),
   default_command('ips'),
   default_command('uptime'),
   default_command('shares'),
-- 
cgit v1.2.3