summaryrefslogtreecommitdiffstats
path: root/filehooker/root-image/etc/systemd
diff options
context:
space:
mode:
Diffstat (limited to 'filehooker/root-image/etc/systemd')
-rw-r--r--filehooker/root-image/etc/systemd/system/dhcpcd.service.d/force-reboot.conf2
-rw-r--r--filehooker/root-image/etc/systemd/system/filehooker-hostname.service2
-rw-r--r--filehooker/root-image/etc/systemd/system/getty@tty1.service.d/autologin.conf2
-rw-r--r--filehooker/root-image/etc/systemd/system/start-ncdc.service13
-rw-r--r--filehooker/root-image/etc/systemd/system/start-ncdc@.service13
-rw-r--r--filehooker/root-image/etc/systemd/system/tor-configure-hidden.service (renamed from filehooker/root-image/etc/systemd/system/tor-announce.service)4
6 files changed, 19 insertions, 17 deletions
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
new file mode 100644
index 00000000..5b506341
--- /dev/null
+++ b/filehooker/root-image/etc/systemd/system/dhcpcd.service.d/force-reboot.conf
@@ -0,0 +1,2 @@
+[Service]
+StartLimitAction=reboot-force
diff --git a/filehooker/root-image/etc/systemd/system/filehooker-hostname.service b/filehooker/root-image/etc/systemd/system/filehooker-hostname.service
index 67879d82..8a23773c 100644
--- a/filehooker/root-image/etc/systemd/system/filehooker-hostname.service
+++ b/filehooker/root-image/etc/systemd/system/filehooker-hostname.service
@@ -1,6 +1,6 @@
[Unit]
Description=change filehooker hostname
-Before=network.target
+Before=network.target nss-lookup.target
[Service]
Type=oneshot
diff --git a/filehooker/root-image/etc/systemd/system/getty@tty1.service.d/autologin.conf b/filehooker/root-image/etc/systemd/system/getty@tty1.service.d/autologin.conf
index d1d8474c..5c6618c5 100644
--- a/filehooker/root-image/etc/systemd/system/getty@tty1.service.d/autologin.conf
+++ b/filehooker/root-image/etc/systemd/system/getty@tty1.service.d/autologin.conf
@@ -1,3 +1,3 @@
[Service]
ExecStart=
-ExecStart=-/sbin/agetty --autologin root --noclear %I 38400 linux
+#ExecStart=-/sbin/agetty --autologin root --noclear %I 38400 linux
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 8099678d..00000000
--- a/filehooker/root-image/etc/systemd/system/start-ncdc.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=ncdc autoconfig
-Requires=network.target local-fs.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-KillMode=none
-ExecStart=sh /krebs/bin/startup_ncdc.ship
-ExecStop=sudo -u hooker /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/start-ncdc@.service b/filehooker/root-image/etc/systemd/system/start-ncdc@.service
new file mode 100644
index 00000000..2c897126
--- /dev/null
+++ b/filehooker/root-image/etc/systemd/system/start-ncdc@.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=ncdc autoconfig and startup for %i
+Requires=network.target local-fs.target
+
+[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-announce.service b/filehooker/root-image/etc/systemd/system/tor-configure-hidden.service
index 818a5c4c..c9b8f20f 100644
--- a/filehooker/root-image/etc/systemd/system/tor-announce.service
+++ b/filehooker/root-image/etc/systemd/system/tor-configure-hidden.service
@@ -1,11 +1,11 @@
[Unit]
Description=Announce Tor Hidden Address
-After=network.target
+After=network.target nss-lookup.target
[Service]
Type=oneshot
RemainAfterExit=yes
-ExecStart=/krebs/bin/tor_announce.ship
+ExecStart=/krebs/bin/tor_configure_hidden_service.ship
[Install]
WantedBy=multi-user.target