server: Drop novaboot-delayed-power-off.target

We used it in our first implementation of delayed power off, but now,
it is unused.

diff --git a/debian/novaboot-server.install b/debian/novaboot-server.install
index c13ab8b07e08d4c91299df5fd3d37178e02d080b..6f35d49f2e1f79e00e399636a15fce9c5cc7604a 100644 (file)
--- a/debian/novaboot-server.install
+++ b/debian/novaboot-server.install
@@ -5,7 +5,6 @@
 /usr/sbin/novaboot-power
 /usr/bin/novaboot-shell
 /usr/lib/systemd/user/novaboot-delayed-power-off.service
-/usr/lib/systemd/user/novaboot-delayed-power-off.target
 /usr/lib/sysusers.d/novaboot-server.conf
 /usr/sbin/adduser-novaboot
 /usr/share/man/man1/novaboot-shell.1

diff --git a/server/Makefile b/server/Makefile
index 9f2df24b77e2a210de8cdb9170564695d41903ed..afab39dfdc124011d6f091700e202357e9a4ebe3 100644 (file)
--- a/server/Makefile
+++ b/server/Makefile
@@ -18,6 +18,5 @@ install: all
        install -D -m 644 -t $(DESTDIR)$(PREFIX)/lib/systemd/system systemd/novaboot-power-off@.timer
        install -D -m 644 -t $(DESTDIR)$(PREFIX)/lib/systemd/system systemd/novaboot-power@.service
        install -D -m 644 -t $(DESTDIR)$(PREFIX)/lib/systemd/user systemd/novaboot-delayed-power-off.service
-       install -D -m 644 -t $(DESTDIR)$(PREFIX)/lib/systemd/user systemd/novaboot-delayed-power-off.target
        install -D -m 440 systemd/sudoers.novaboot-server $(DESTDIR)/etc/sudoers.d/novaboot-server
        install -D -m 755 -t $(DESTDIR)$(PREFIX)/sbin systemd/novaboot-power

diff --git a/server/systemd/novaboot-delayed-power-off.service b/server/systemd/novaboot-delayed-power-off.service
index c469c12619c2a80e503f2a36ea2165e0284d6482..9d50e9d76d60fb5e805a90cc7537e19422fc81dd 100644 (file)
--- a/server/systemd/novaboot-delayed-power-off.service
+++ b/server/systemd/novaboot-delayed-power-off.service
@@ -8,6 +8,3 @@ Type=oneshot
 ExecStart=/usr/bin/sudo novaboot-power on
 ExecStop=/usr/bin/sudo novaboot-power delayed-off
 RemainAfterExit=true
-
-[Install]
-WantedBy=novaboot-delayed-power-off.target

diff --git a/server/systemd/novaboot-delayed-power-off.target b/server/systemd/novaboot-delayed-power-off.target
index eed1e29c4c0c890b411c2a3654dbdc738636c8c0..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/server/systemd/novaboot-delayed-power-off.target
+++ b/server/systemd/novaboot-delayed-power-off.target
@@ -1,6 +0,0 @@
-# This unit serves only as a placeholde that allows enabling and
-# disabling novaboot-delayed-power-off.service. We don't use this
-# targer for anything.
-[Unit]
-Description=Novaboot power on target
-Documentation=man:novaboot-shell(1)

diff --git a/server/systemd/novaboot-power b/server/systemd/novaboot-power
index ede6e7bc2fda28c9b2640627bbac9c73b882d28c..801179520e29282bb7d03e95b2af85772f477839 100755 (executable)
--- a/server/systemd/novaboot-power
+++ b/server/systemd/novaboot-power
@@ -15,7 +15,6 @@ case "$1" in
        ;;
     delayed-off)
        systemctl start "novaboot-power-off@${SUDO_USER}.timer"
-       # || systemd-run --on-active="$2" --unit="novaboot-power-off@${SUDO_USER}.target"
        ;;
     *)
        echo >&2 "Invalid argument"