summaryrefslogtreecommitdiffstats
path: root/filehooker
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2014-03-26 03:15:37 +0100
committermakefu <github@syntax-fehler.de>2014-03-26 03:15:37 +0100
commitef2a1f113b0240515982bf1e7525b26f6b9577b2 (patch)
tree85b302d1407dc96a369a400f81fc77de71e32854 /filehooker
parent366248702d97942bb96bb3db2eccb15c94821c22 (diff)
filehooker: add io command,
also add vsftpd to packages and minor fixes
Diffstat (limited to 'filehooker')
-rwxr-xr-xfilehooker/build.sh2
-rw-r--r--filehooker/packages.both2
-rwxr-xr-x[-rw-r--r--]filehooker/root-image/krebs/etc/Reaktor/commands/io0
-rw-r--r--filehooker/root-image/krebs/etc/Reaktor/config.py1
4 files changed, 4 insertions, 1 deletions
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
index eb04ae9b..eb04ae9b 100644..100755
--- a/filehooker/root-image/krebs/etc/Reaktor/commands/io
+++ b/filehooker/root-image/krebs/etc/Reaktor/commands/io
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'),