From 732876299f4dccb4caa3a915879d2b5945bbdd42 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 2 Apr 2014 11:15:54 +0200 Subject: filehooker is now elchOS --- .../root-image/etc/systemd/scripts/choose-mirror | 26 ---------------------- .../etc/systemd/system/choose-mirror.service | 10 --------- .../systemd/system/collectd.service.d/wait.conf | 2 -- .../system/dhcpcd.service.d/force-reboot.conf | 2 -- .../etc/systemd/system/etc-pacman.d-gnupg.mount | 8 ------- .../etc/systemd/system/filehooker-hostname.service | 11 --------- .../getty@tty1.service.d/run_krebs_secret.conf | 3 --- .../hddtemp.service.d/monitor_all_disks.conf | 3 --- .../system/ntpdate.service.d/set_hwclock.conf | 2 -- .../etc/systemd/system/pacman-init.service | 15 ------------- .../etc/systemd/system/start-ncdc@.service | 13 ----------- .../systemd/system/tor-configure-hidden.service | 11 --------- 12 files changed, 106 deletions(-) delete mode 100755 filehooker/root-image/etc/systemd/scripts/choose-mirror delete mode 100644 filehooker/root-image/etc/systemd/system/choose-mirror.service delete mode 100644 filehooker/root-image/etc/systemd/system/collectd.service.d/wait.conf delete mode 100644 filehooker/root-image/etc/systemd/system/dhcpcd.service.d/force-reboot.conf delete mode 100644 filehooker/root-image/etc/systemd/system/etc-pacman.d-gnupg.mount delete mode 100644 filehooker/root-image/etc/systemd/system/filehooker-hostname.service delete mode 100644 filehooker/root-image/etc/systemd/system/getty@tty1.service.d/run_krebs_secret.conf delete mode 100644 filehooker/root-image/etc/systemd/system/hddtemp.service.d/monitor_all_disks.conf delete mode 100644 filehooker/root-image/etc/systemd/system/ntpdate.service.d/set_hwclock.conf delete mode 100644 filehooker/root-image/etc/systemd/system/pacman-init.service delete mode 100644 filehooker/root-image/etc/systemd/system/start-ncdc@.service delete mode 100644 filehooker/root-image/etc/systemd/system/tor-configure-hidden.service (limited to 'filehooker/root-image/etc/systemd') diff --git a/filehooker/root-image/etc/systemd/scripts/choose-mirror b/filehooker/root-image/etc/systemd/scripts/choose-mirror deleted file mode 100755 index 0ae08067..00000000 --- a/filehooker/root-image/etc/systemd/scripts/choose-mirror +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -get_cmdline() { - local param - for param in $(< /proc/cmdline); do - case "${param}" in - $1=*) echo "${param##*=}"; - return 0 - ;; - esac - done -} - -mirror=$(get_cmdline mirror) -[[ $mirror = auto ]] && mirror=$(get_cmdline archiso_http_srv) -[[ $mirror ]] || exit 0 - -mv /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist.orig -cat >/etc/pacman.d/mirrorlist << EOF -# -# Arch Linux repository mirrorlist -# Generated by archiso -# - -Server = ${mirror%%/}/\$repo/os/\$arch -EOF diff --git a/filehooker/root-image/etc/systemd/system/choose-mirror.service b/filehooker/root-image/etc/systemd/system/choose-mirror.service deleted file mode 100644 index 1e4d771d..00000000 --- a/filehooker/root-image/etc/systemd/system/choose-mirror.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Choose mirror from the kernel command line -ConditionKernelCommandLine=mirror - -[Service] -Type=oneshot -ExecStart=/etc/systemd/scripts/choose-mirror - -[Install] -WantedBy=multi-user.target diff --git a/filehooker/root-image/etc/systemd/system/collectd.service.d/wait.conf b/filehooker/root-image/etc/systemd/system/collectd.service.d/wait.conf deleted file mode 100644 index 05d8b43c..00000000 --- a/filehooker/root-image/etc/systemd/system/collectd.service.d/wait.conf +++ /dev/null @@ -1,2 +0,0 @@ -[Service] -ExecStartPre=/usr/bin/sleep 20 diff --git a/filehooker/root-image/etc/systemd/system/dhcpcd.service.d/force-reboot.conf b/filehooker/root-image/etc/systemd/system/dhcpcd.service.d/force-reboot.conf deleted file mode 100644 index 5b506341..00000000 --- a/filehooker/root-image/etc/systemd/system/dhcpcd.service.d/force-reboot.conf +++ /dev/null @@ -1,2 +0,0 @@ -[Service] -StartLimitAction=reboot-force diff --git a/filehooker/root-image/etc/systemd/system/etc-pacman.d-gnupg.mount b/filehooker/root-image/etc/systemd/system/etc-pacman.d-gnupg.mount deleted file mode 100644 index 4eab5513..00000000 --- a/filehooker/root-image/etc/systemd/system/etc-pacman.d-gnupg.mount +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Temporary /etc/pacman.d/gnupg directory - -[Mount] -What=tmpfs -Where=/etc/pacman.d/gnupg -Type=tmpfs -Options=mode=0755 diff --git a/filehooker/root-image/etc/systemd/system/filehooker-hostname.service b/filehooker/root-image/etc/systemd/system/filehooker-hostname.service deleted file mode 100644 index bcee7964..00000000 --- a/filehooker/root-image/etc/systemd/system/filehooker-hostname.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=change filehooker hostname -Before=network.target nss-lookup.target multi-user.target - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=/krebs/bin/set-hostname.sh - -[Install] -WantedBy=multi-user.target diff --git a/filehooker/root-image/etc/systemd/system/getty@tty1.service.d/run_krebs_secret.conf b/filehooker/root-image/etc/systemd/system/getty@tty1.service.d/run_krebs_secret.conf deleted file mode 100644 index 29e5be5f..00000000 --- a/filehooker/root-image/etc/systemd/system/getty@tty1.service.d/run_krebs_secret.conf +++ /dev/null @@ -1,3 +0,0 @@ -[Service] -ExecStart= -ExecStart=-/usr/bin/agetty --autologin reaktor --noclear %I 38400 linux diff --git a/filehooker/root-image/etc/systemd/system/hddtemp.service.d/monitor_all_disks.conf b/filehooker/root-image/etc/systemd/system/hddtemp.service.d/monitor_all_disks.conf deleted file mode 100644 index e6b8fcda..00000000 --- a/filehooker/root-image/etc/systemd/system/hddtemp.service.d/monitor_all_disks.conf +++ /dev/null @@ -1,3 +0,0 @@ -[Service] -ExecStart= -ExecStart=/bin/bash -c "/usr/bin/hddtemp -dF hddtemp -d /dev/[vsh]d[a-z]" diff --git a/filehooker/root-image/etc/systemd/system/ntpdate.service.d/set_hwclock.conf b/filehooker/root-image/etc/systemd/system/ntpdate.service.d/set_hwclock.conf deleted file mode 100644 index e57550c8..00000000 --- a/filehooker/root-image/etc/systemd/system/ntpdate.service.d/set_hwclock.conf +++ /dev/null @@ -1,2 +0,0 @@ -[Service] -ExecStart=/usr/bin/hwclock --systohc --utc -w diff --git a/filehooker/root-image/etc/systemd/system/pacman-init.service b/filehooker/root-image/etc/systemd/system/pacman-init.service deleted file mode 100644 index 23b81445..00000000 --- a/filehooker/root-image/etc/systemd/system/pacman-init.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Initializes Pacman keyring -Wants=haveged.service -After=haveged.service -Requires=etc-pacman.d-gnupg.mount -After=etc-pacman.d-gnupg.mount - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=/usr/bin/pacman-key --init -ExecStart=/usr/bin/pacman-key --populate archlinux - -[Install] -WantedBy=multi-user.target diff --git a/filehooker/root-image/etc/systemd/system/start-ncdc@.service b/filehooker/root-image/etc/systemd/system/start-ncdc@.service deleted file mode 100644 index 1189be0f..00000000 --- a/filehooker/root-image/etc/systemd/system/start-ncdc@.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=ncdc autoconfig and startup for %i -After=network.target local-fs.target multi-user.target filehooker-hostname.service - -[Service] -Type=oneshot -RemainAfterExit=yes -#KillMode=none -ExecStart=/usr/bin/tmux new-session -n startup -d "/bin/sh /krebs/bin/start-ncdc.ship" -ExecStop=/usr/bin/sudo -u %i /usr/bin/tmux send-keys -t dcpp:ncdc "/quit" C-m - -[Install] -WantedBy=multi-user.target diff --git a/filehooker/root-image/etc/systemd/system/tor-configure-hidden.service b/filehooker/root-image/etc/systemd/system/tor-configure-hidden.service deleted file mode 100644 index c9b8f20f..00000000 --- a/filehooker/root-image/etc/systemd/system/tor-configure-hidden.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Announce Tor Hidden Address -After=network.target nss-lookup.target - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=/krebs/bin/tor_configure_hidden_service.ship - -[Install] -WantedBy=multi-user.target -- cgit v1.2.3