From: Michal Sojka <michal.sojka@cvut.cz>
Date: Thu, 17 Dec 2020 08:58:17 +0000 (+0100)
Subject: Rename novaboot-power-off.service to novaboot-delayed-power-off.service
X-Git-Tag: 20201217~2
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/novaboot.git/commitdiff_plain/916ad955da772d39df5c565f5299a034b04b0e32

Rename novaboot-power-off.service to novaboot-delayed-power-off.service

Also rework the logic to not relay on systemd's Conflicts but switch
off the timer explicitly in novaboot-power script.
---

diff --git a/debian/novaboot-server.install b/debian/novaboot-server.install
index 1659f1d..6f35d49 100644
--- a/debian/novaboot-server.install
+++ b/debian/novaboot-server.install
@@ -4,7 +4,7 @@
 /lib/systemd/system/novaboot-power@.service
 /usr/sbin/novaboot-power
 /usr/bin/novaboot-shell
-/usr/lib/systemd/user/novaboot-power-off.service
+/usr/lib/systemd/user/novaboot-delayed-power-off.service
 /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 812071a..190c5a1 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -17,6 +17,6 @@ install: all
 	install -D -m 644 -t $(DESTDIR)/lib/systemd/system systemd/novaboot-power-off@.service
 	install -D -m 644 -t $(DESTDIR)/lib/systemd/system systemd/novaboot-power-off@.timer
 	install -D -m 644 -t $(DESTDIR)/lib/systemd/system systemd/novaboot-power@.service
-	install -D -m 644 -t $(DESTDIR)/usr/lib/systemd/user systemd/novaboot-power-off.service
+	install -D -m 644 -t $(DESTDIR)/usr/lib/systemd/user systemd/novaboot-delayed-power-off.service
 	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/adduser-novaboot b/server/adduser-novaboot
index b4417d4..dec3804 100755
--- a/server/adduser-novaboot
+++ b/server/adduser-novaboot
@@ -96,12 +96,12 @@ chown $user: $home/.novaboot-shell
 
 if [ -d /run/systemd/system ]; then
     cat <<EOF
-To enable automatic delayed power-off run 'systemctl --user enable novaboot-power-off'
+To enable automatic delayed power-off run 'systemctl --user enable novaboot-delayed-power-off'
 as the created user (e.g. via shell subcommand)
 EOF
     # TODO: Add a way to run in automatically from here (allow shell
     #subcommand to accept command lines)
-    #systemctl --user enable novaboot-power-off
+    #systemctl --user enable novaboot-delayed-power-off
 fi
 
 
diff --git a/server/novaboot-shell b/server/novaboot-shell
index e9c60f7..10ed173 100755
--- a/server/novaboot-shell
+++ b/server/novaboot-shell
@@ -97,7 +97,7 @@ power() {
 	*) die "Unexpected power parameter";;
     esac
 
-    if [ "$PPID" -ne 1 ] && systemctl --user is-enabled novaboot-power-off.service; then
+    if [ "$PPID" -ne 1 ] && systemctl --user is-enabled novaboot-delayed-power-off.service; then
 	sudo novaboot-power "$1"
     else
 	eval "$cmd"
diff --git a/server/systemd/novaboot-power-off.service b/server/systemd/novaboot-delayed-power-off.service
similarity index 100%
rename from server/systemd/novaboot-power-off.service
rename to server/systemd/novaboot-delayed-power-off.service
diff --git a/server/systemd/novaboot-power b/server/systemd/novaboot-power
index 8b1663e..ede6e7b 100755
--- a/server/systemd/novaboot-power
+++ b/server/systemd/novaboot-power
@@ -7,9 +7,12 @@ fi
 
 case "$1" in
     on)
-	exec systemctl start "novaboot-power@${SUDO_USER}.service";;
+	systemctl stop  "novaboot-power-off@${SUDO_USER}.timer"
+	systemctl start "novaboot-power@${SUDO_USER}.service"
+	;;
     off)
-	exec systemctl stop "novaboot-power@${SUDO_USER}.service";;
+	systemctl stop "novaboot-power@${SUDO_USER}.service"
+	;;
     delayed-off)
 	systemctl start "novaboot-power-off@${SUDO_USER}.timer"
 	# || systemd-run --on-active="$2" --unit="novaboot-power-off@${SUDO_USER}.target"
diff --git a/server/systemd/novaboot-power@.service b/server/systemd/novaboot-power@.service
index b5702b4..19ab41b 100644
--- a/server/systemd/novaboot-power@.service
+++ b/server/systemd/novaboot-power@.service
@@ -4,7 +4,6 @@ Description=Power on/off novaboot target %i
 [Service]
 Type=oneshot
 RemainAfterExit=true
-ExecStartPre=systemctl stop novaboot-power-off@%i.timer
 ExecStart=/usr/bin/novaboot-shell on
 ExecStop=/usr/bin/novaboot-shell off
 User=%i