summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--elchos/.gitignore (renamed from filehooker/.gitignore)0
-rw-r--r--elchos/README.md23
-rw-r--r--elchos/aitab (renamed from filehooker/aitab)0
-rwxr-xr-xelchos/build.sh (renamed from filehooker/build.sh)0
-rw-r--r--elchos/efiboot/loader/entries/archiso-x86_64-cd.conf (renamed from filehooker/efiboot/loader/entries/archiso-x86_64-cd.conf)0
-rw-r--r--elchos/efiboot/loader/entries/archiso-x86_64-usb.conf (renamed from filehooker/efiboot/loader/entries/archiso-x86_64-usb.conf)0
-rw-r--r--elchos/efiboot/loader/entries/uefi-shell-v1-x86_64.conf (renamed from filehooker/efiboot/loader/entries/uefi-shell-v1-x86_64.conf)0
-rw-r--r--elchos/efiboot/loader/entries/uefi-shell-v2-x86_64.conf (renamed from filehooker/efiboot/loader/entries/uefi-shell-v2-x86_64.conf)0
-rw-r--r--elchos/efiboot/loader/loader.conf (renamed from filehooker/efiboot/loader/loader.conf)0
-rw-r--r--elchos/isolinux/isolinux.cfg (renamed from filehooker/isolinux/isolinux.cfg)0
-rw-r--r--elchos/mkinitcpio.conf (renamed from filehooker/mkinitcpio.conf)0
-rw-r--r--elchos/packages.both (renamed from filehooker/packages.both)0
-rw-r--r--elchos/packages.i686 (renamed from filehooker/packages.i686)0
-rw-r--r--elchos/packages.x86_64 (renamed from filehooker/packages.x86_64)0
-rw-r--r--elchos/pacman.conf (renamed from filehooker/pacman.conf)0
-rwxr-xr-xelchos/refresh.sh8
-rw-r--r--elchos/root-image/etc/collectd.conf (renamed from filehooker/root-image/etc/collectd.conf)2
-rw-r--r--elchos/root-image/etc/fstab (renamed from filehooker/root-image/etc/fstab)0
-rw-r--r--elchos/root-image/etc/hostname (renamed from filehooker/root-image/etc/hostname)0
-rw-r--r--elchos/root-image/etc/locale.conf (renamed from filehooker/root-image/etc/locale.conf)0
-rw-r--r--elchos/root-image/etc/pam.d/su (renamed from filehooker/root-image/etc/pam.d/su)0
-rw-r--r--elchos/root-image/etc/sudoers.d/g_wheel (renamed from filehooker/root-image/etc/sudoers.d/g_wheel)0
-rwxr-xr-xelchos/root-image/etc/systemd/scripts/choose-mirror (renamed from filehooker/root-image/etc/systemd/scripts/choose-mirror)0
-rw-r--r--elchos/root-image/etc/systemd/system/choose-mirror.service (renamed from filehooker/root-image/etc/systemd/system/choose-mirror.service)0
-rw-r--r--elchos/root-image/etc/systemd/system/collectd.service.d/wait.conf (renamed from filehooker/root-image/etc/systemd/system/collectd.service.d/wait.conf)0
-rw-r--r--elchos/root-image/etc/systemd/system/dhcpcd.service.d/force-reboot.conf (renamed from filehooker/root-image/etc/systemd/system/dhcpcd.service.d/force-reboot.conf)0
-rw-r--r--elchos/root-image/etc/systemd/system/elch-hostname.service (renamed from filehooker/root-image/etc/systemd/system/filehooker-hostname.service)0
-rw-r--r--elchos/root-image/etc/systemd/system/etc-pacman.d-gnupg.mount (renamed from filehooker/root-image/etc/systemd/system/etc-pacman.d-gnupg.mount)0
-rw-r--r--elchos/root-image/etc/systemd/system/getty@tty1.service.d/run_krebs_secret.conf (renamed from filehooker/root-image/etc/systemd/system/getty@tty1.service.d/run_krebs_secret.conf)0
-rw-r--r--elchos/root-image/etc/systemd/system/hddtemp.service.d/monitor_all_disks.conf (renamed from filehooker/root-image/etc/systemd/system/hddtemp.service.d/monitor_all_disks.conf)0
-rw-r--r--elchos/root-image/etc/systemd/system/ntpdate.service.d/set_hwclock.conf (renamed from filehooker/root-image/etc/systemd/system/ntpdate.service.d/set_hwclock.conf)0
-rw-r--r--elchos/root-image/etc/systemd/system/pacman-init.service (renamed from filehooker/root-image/etc/systemd/system/pacman-init.service)0
-rw-r--r--elchos/root-image/etc/systemd/system/start-ncdc@.service (renamed from filehooker/root-image/etc/systemd/system/start-ncdc@.service)2
-rw-r--r--elchos/root-image/etc/systemd/system/tor-configure-hidden.service (renamed from filehooker/root-image/etc/systemd/system/tor-configure-hidden.service)0
-rw-r--r--elchos/root-image/etc/udev/rules.d/81-dhcpcd.rules (renamed from filehooker/root-image/etc/udev/rules.d/81-dhcpcd.rules)0
-rwxr-xr-xelchos/root-image/krebs/bin/add-reaktor-secret.sh (renamed from filehooker/root-image/krebs/bin/add-reaktor-secret.sh)0
-rwxr-xr-xelchos/root-image/krebs/bin/macid.sh (renamed from filehooker/root-image/krebs/bin/macid.sh)0
-rwxr-xr-xelchos/root-image/krebs/bin/reaktor-shell.sh (renamed from filehooker/root-image/krebs/bin/reaktor-shell.sh)0
-rwxr-xr-xelchos/root-image/krebs/bin/refresh-shares.ship (renamed from filehooker/root-image/krebs/bin/refresh-shares.ship)0
-rwxr-xr-xelchos/root-image/krebs/bin/set-hostname.sh (renamed from filehooker/root-image/krebs/bin/set-hostname.sh)0
-rwxr-xr-xelchos/root-image/krebs/bin/start-ncdc.ship (renamed from filehooker/root-image/krebs/bin/start-ncdc.ship)0
-rwxr-xr-xelchos/root-image/krebs/bin/tor-get-hidden-service.sh (renamed from filehooker/root-image/krebs/bin/tor-get-hidden-service.sh)0
-rwxr-xr-xelchos/root-image/krebs/bin/tor_configure_hidden_service.ship (renamed from filehooker/root-image/krebs/bin/tor_configure_hidden_service.ship)0
-rwxr-xr-xelchos/root-image/krebs/bin/tor_publish_ssh.ship (renamed from filehooker/root-image/krebs/bin/tor_publish_ssh.ship)0
-rwxr-xr-xelchos/root-image/krebs/bin/update-search.sh (renamed from filehooker/root-image/krebs/bin/update-search.sh)0
-rwxr-xr-xelchos/root-image/krebs/bin/vim_sane_defaults.ship (renamed from filehooker/root-image/krebs/bin/vim_sane_defaults.ship)0
-rw-r--r--elchos/root-image/krebs/etc/Reaktor/admin.lst (renamed from filehooker/root-image/krebs/etc/Reaktor/admin.lst)0
-rw-r--r--elchos/root-image/krebs/etc/Reaktor/auth.lst (renamed from filehooker/root-image/krebs/etc/Reaktor/auth.lst)0
-rwxr-xr-xelchos/root-image/krebs/etc/Reaktor/commands/ftpget (renamed from filehooker/root-image/krebs/etc/Reaktor/commands/ftpget)0
-rwxr-xr-xelchos/root-image/krebs/etc/Reaktor/commands/identify (renamed from filehooker/root-image/krebs/etc/Reaktor/commands/identify)0
-rwxr-xr-xelchos/root-image/krebs/etc/Reaktor/commands/io (renamed from filehooker/root-image/krebs/etc/Reaktor/commands/io)0
-rwxr-xr-xelchos/root-image/krebs/etc/Reaktor/commands/ips (renamed from filehooker/root-image/krebs/etc/Reaktor/commands/ips)0
-rwxr-xr-xelchos/root-image/krebs/etc/Reaktor/commands/list_downloads (renamed from filehooker/root-image/krebs/etc/Reaktor/commands/list_downloads)0
-rwxr-xr-xelchos/root-image/krebs/etc/Reaktor/commands/onion (renamed from filehooker/root-image/krebs/etc/Reaktor/commands/onion)0
-rwxr-xr-xelchos/root-image/krebs/etc/Reaktor/commands/reboot (renamed from filehooker/root-image/krebs/etc/Reaktor/commands/reboot)0
-rwxr-xr-xelchos/root-image/krebs/etc/Reaktor/commands/refresh_shares (renamed from filehooker/root-image/krebs/etc/Reaktor/commands/refresh_shares)0
-rwxr-xr-xelchos/root-image/krebs/etc/Reaktor/commands/shares (renamed from filehooker/root-image/krebs/etc/Reaktor/commands/shares)0
-rwxr-xr-xelchos/root-image/krebs/etc/Reaktor/commands/update-search (renamed from filehooker/root-image/krebs/etc/Reaktor/commands/update-search)0
-rw-r--r--elchos/root-image/krebs/etc/Reaktor/config.py (renamed from filehooker/root-image/krebs/etc/Reaktor/config.py)0
-rw-r--r--elchos/root-image/krebs/etc/authorized_keys (renamed from filehooker/root-image/krebs/etc/authorized_keys)0
-rw-r--r--elchos/root-image/krebs/etc/vsftpd.conf (renamed from filehooker/root-image/krebs/etc/vsftpd.conf)4
-rw-r--r--elchos/root-image/krebs/lib/_punani_db (renamed from filehooker/root-image/krebs/lib/_punani_db)0
-rw-r--r--elchos/root-image/krebs/lib/color (renamed from filehooker/root-image/krebs/lib/color)0
-rw-r--r--elchos/root-image/krebs/lib/core (renamed from filehooker/root-image/krebs/lib/core)0
-rw-r--r--elchos/root-image/krebs/lib/filehooker (renamed from filehooker/root-image/krebs/lib/filehooker)0
-rw-r--r--elchos/root-image/krebs/lib/iso (renamed from filehooker/root-image/krebs/lib/iso)0
-rw-r--r--elchos/root-image/krebs/lib/krebs (renamed from filehooker/root-image/krebs/lib/krebs)0
-rw-r--r--elchos/root-image/krebs/lib/network (renamed from filehooker/root-image/krebs/lib/network)0
-rw-r--r--elchos/root-image/krebs/lib/punani (renamed from filehooker/root-image/krebs/lib/punani)0
-rw-r--r--elchos/root-image/krebs/lib/retiolum (renamed from filehooker/root-image/krebs/lib/retiolum)0
-rw-r--r--elchos/root-image/krebs/lib/tahoe (renamed from filehooker/root-image/krebs/lib/tahoe)0
-rw-r--r--elchos/root-image/krebs/lib/tor (renamed from filehooker/root-image/krebs/lib/tor)0
-rw-r--r--elchos/root-image/krebs/lib/vim (renamed from filehooker/root-image/krebs/lib/vim)0
-rwxr-xr-xelchos/root-image/root/.automated_script.sh (renamed from filehooker/root-image/root/.automated_script.sh)0
-rw-r--r--elchos/root-image/root/.zlogin (renamed from filehooker/root-image/root/.zlogin)0
-rwxr-xr-xelchos/root-image/root/customize_root_image.sh (renamed from filehooker/root-image/root/customize_root_image.sh)4
-rwxr-xr-xelchos/root-image/usr/bin/ncdc (renamed from filehooker/root-image/usr/bin/ncdc)bin4242384 -> 4242384 bytes
-rw-r--r--elchos/syslinux/archiso.cfg (renamed from filehooker/syslinux/archiso.cfg)0
-rw-r--r--elchos/syslinux/archiso_head.cfg (renamed from filehooker/syslinux/archiso_head.cfg)0
-rw-r--r--elchos/syslinux/archiso_pxe32.cfg (renamed from filehooker/syslinux/archiso_pxe32.cfg)0
-rw-r--r--elchos/syslinux/archiso_pxe64.cfg (renamed from filehooker/syslinux/archiso_pxe64.cfg)0
-rw-r--r--elchos/syslinux/archiso_pxe_32_inc.cfg (renamed from filehooker/syslinux/archiso_pxe_32_inc.cfg)0
-rw-r--r--elchos/syslinux/archiso_pxe_both_inc.cfg (renamed from filehooker/syslinux/archiso_pxe_both_inc.cfg)0
-rw-r--r--elchos/syslinux/archiso_pxe_choose.cfg (renamed from filehooker/syslinux/archiso_pxe_choose.cfg)0
-rw-r--r--elchos/syslinux/archiso_sys32.cfg (renamed from filehooker/syslinux/archiso_sys32.cfg)0
-rw-r--r--elchos/syslinux/archiso_sys64.cfg (renamed from filehooker/syslinux/archiso_sys64.cfg)0
-rw-r--r--elchos/syslinux/archiso_sys_32_inc.cfg (renamed from filehooker/syslinux/archiso_sys_32_inc.cfg)0
-rw-r--r--elchos/syslinux/archiso_sys_both_inc.cfg (renamed from filehooker/syslinux/archiso_sys_both_inc.cfg)0
-rw-r--r--elchos/syslinux/archiso_sys_choose.cfg (renamed from filehooker/syslinux/archiso_sys_choose.cfg)0
-rw-r--r--elchos/syslinux/archiso_tail.cfg (renamed from filehooker/syslinux/archiso_tail.cfg)0
-rw-r--r--elchos/syslinux/splash.png (renamed from filehooker/syslinux/splash.png)bin8810 -> 8810 bytes
-rw-r--r--elchos/syslinux/syslinux.cfg (renamed from filehooker/syslinux/syslinux.cfg)0
-rw-r--r--filehooker/README.md6
-rwxr-xr-xfilehooker/refresh.sh6
94 files changed, 37 insertions, 18 deletions
diff --git a/filehooker/.gitignore b/elchos/.gitignore
index 6b6e109e..6b6e109e 100644
--- a/filehooker/.gitignore
+++ b/elchos/.gitignore
diff --git a/elchos/README.md b/elchos/README.md
new file mode 100644
index 00000000..4209db7c
--- /dev/null
+++ b/elchos/README.md
@@ -0,0 +1,23 @@
+# Elch
+This builds the elch sharing distribution.
+
+# Usage
+
+ # create a new iso
+ ./refresh
+ # creates:
+ # out/elchos.iso
+
+# Requirements
+Both development environment and Final Distro are based on a heavily remastered
+version of the Arch Linux Install Stick. On Arch you need archiso to build the
+distro.
+
+ pacman -Sy archiso
+
+# Configured URLs
+- elchstats.nsupdate.info -> the graphite stats receiver
+- elchirc.nsupdate.info -> the irc to be used
+ irc.freenode.net currently hardcoded
+ in root-image/krebs/etc/Reaktor/config.py
+- elchhub.nsupdate.info -> the dcpp hub to be used
diff --git a/filehooker/aitab b/elchos/aitab
index b7e9a17a..b7e9a17a 100644
--- a/filehooker/aitab
+++ b/elchos/aitab
diff --git a/filehooker/build.sh b/elchos/build.sh
index 671b15b5..671b15b5 100755
--- a/filehooker/build.sh
+++ b/elchos/build.sh
diff --git a/filehooker/efiboot/loader/entries/archiso-x86_64-cd.conf b/elchos/efiboot/loader/entries/archiso-x86_64-cd.conf
index 9892c591..9892c591 100644
--- a/filehooker/efiboot/loader/entries/archiso-x86_64-cd.conf
+++ b/elchos/efiboot/loader/entries/archiso-x86_64-cd.conf
diff --git a/filehooker/efiboot/loader/entries/archiso-x86_64-usb.conf b/elchos/efiboot/loader/entries/archiso-x86_64-usb.conf
index f61c5323..f61c5323 100644
--- a/filehooker/efiboot/loader/entries/archiso-x86_64-usb.conf
+++ b/elchos/efiboot/loader/entries/archiso-x86_64-usb.conf
diff --git a/filehooker/efiboot/loader/entries/uefi-shell-v1-x86_64.conf b/elchos/efiboot/loader/entries/uefi-shell-v1-x86_64.conf
index 9597ff2f..9597ff2f 100644
--- a/filehooker/efiboot/loader/entries/uefi-shell-v1-x86_64.conf
+++ b/elchos/efiboot/loader/entries/uefi-shell-v1-x86_64.conf
diff --git a/filehooker/efiboot/loader/entries/uefi-shell-v2-x86_64.conf b/elchos/efiboot/loader/entries/uefi-shell-v2-x86_64.conf
index 0dde77ab..0dde77ab 100644
--- a/filehooker/efiboot/loader/entries/uefi-shell-v2-x86_64.conf
+++ b/elchos/efiboot/loader/entries/uefi-shell-v2-x86_64.conf
diff --git a/filehooker/efiboot/loader/loader.conf b/elchos/efiboot/loader/loader.conf
index 62c4a839..62c4a839 100644
--- a/filehooker/efiboot/loader/loader.conf
+++ b/elchos/efiboot/loader/loader.conf
diff --git a/filehooker/isolinux/isolinux.cfg b/elchos/isolinux/isolinux.cfg
index 10fd2852..10fd2852 100644
--- a/filehooker/isolinux/isolinux.cfg
+++ b/elchos/isolinux/isolinux.cfg
diff --git a/filehooker/mkinitcpio.conf b/elchos/mkinitcpio.conf
index 2f46da49..2f46da49 100644
--- a/filehooker/mkinitcpio.conf
+++ b/elchos/mkinitcpio.conf
diff --git a/filehooker/packages.both b/elchos/packages.both
index 409abe91..409abe91 100644
--- a/filehooker/packages.both
+++ b/elchos/packages.both
diff --git a/filehooker/packages.i686 b/elchos/packages.i686
index e69de29b..e69de29b 100644
--- a/filehooker/packages.i686
+++ b/elchos/packages.i686
diff --git a/filehooker/packages.x86_64 b/elchos/packages.x86_64
index 407ead28..407ead28 100644
--- a/filehooker/packages.x86_64
+++ b/elchos/packages.x86_64
diff --git a/filehooker/pacman.conf b/elchos/pacman.conf
index 45fe03dc..45fe03dc 100644
--- a/filehooker/pacman.conf
+++ b/elchos/pacman.conf
diff --git a/elchos/refresh.sh b/elchos/refresh.sh
new file mode 100755
index 00000000..2ff1d59c
--- /dev/null
+++ b/elchos/refresh.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+cd "$(dirname "$(readlink -f "$0")")"
+rm -rvf out/ work
+./build.sh -N elchos -v
+# cp -v out/filehooker* /home/makefu/isos
+# TODO internal
+# virsh reset vm1 ||:
diff --git a/filehooker/root-image/etc/collectd.conf b/elchos/root-image/etc/collectd.conf
index 5225a036..30480f2e 100644
--- a/filehooker/root-image/etc/collectd.conf
+++ b/elchos/root-image/etc/collectd.conf
@@ -1,4 +1,4 @@
-#Hostname "filehooker<id>"
+#Hostname "elch_<macid>"
Interval 10
LoadPlugin syslog
diff --git a/filehooker/root-image/etc/fstab b/elchos/root-image/etc/fstab
index e69de29b..e69de29b 100644
--- a/filehooker/root-image/etc/fstab
+++ b/elchos/root-image/etc/fstab
diff --git a/filehooker/root-image/etc/hostname b/elchos/root-image/etc/hostname
index ef8963cd..ef8963cd 100644
--- a/filehooker/root-image/etc/hostname
+++ b/elchos/root-image/etc/hostname
diff --git a/filehooker/root-image/etc/locale.conf b/elchos/root-image/etc/locale.conf
index 01ec548f..01ec548f 100644
--- a/filehooker/root-image/etc/locale.conf
+++ b/elchos/root-image/etc/locale.conf
diff --git a/filehooker/root-image/etc/pam.d/su b/elchos/root-image/etc/pam.d/su
index a2910423..a2910423 100644
--- a/filehooker/root-image/etc/pam.d/su
+++ b/elchos/root-image/etc/pam.d/su
diff --git a/filehooker/root-image/etc/sudoers.d/g_wheel b/elchos/root-image/etc/sudoers.d/g_wheel
index 8c45359f..8c45359f 100644
--- a/filehooker/root-image/etc/sudoers.d/g_wheel
+++ b/elchos/root-image/etc/sudoers.d/g_wheel
diff --git a/filehooker/root-image/etc/systemd/scripts/choose-mirror b/elchos/root-image/etc/systemd/scripts/choose-mirror
index 0ae08067..0ae08067 100755
--- a/