more systemd related fixes

Kicksecure · Jan 8, 2017 · 12a220e · 12a220e
1 parent 31273da
commit 12a220e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/lib/systemd/system/rads-block-display-manger.service b/lib/systemd/system/rads-block-display-manger.service
@@ -5,6 +5,7 @@
 [Unit]
 Description=Ram Adjusted Desktop Starter Early Boot Display Manger Startup Preventer
 Documentation=https://www.whonix.org/wiki/RAM_Adjusted_Desktop_Starter
+ConditionPathExists=/dev/tty0
 Before=rads.service
 Before=getty.target
 Before=graphical.target

diff --git a/lib/systemd/system/rads.service b/lib/systemd/system/rads.service
@@ -5,7 +5,8 @@
 [Unit]
 Description=Ram Adjusted Desktop Starter
 Documentation=https://www.whonix.org/wiki/RAM_Adjusted_Desktop_Starter
-Before=getty.target
+ConditionPathExists=/dev/tty0
+Before=getty@tty1.service
 After=rads-block-display-manger.service
 
 [Service]
@@ -14,7 +15,7 @@ ExecStart=/usr/lib/ram_adjusted_desktop_starter/ram_adjusted_desktop_starter
 ExecStartPost=/bin/rm --force /var/run/rads/rads-block-display-manger-startup.status
 RemainAfterExit=yes
 StandardOutput=journal+console
-StandardInput=tty
+StandardInput=tty-force
 
 [Install]
 WantedBy=multi-user.target
diff --git a/usr/lib/ram_adjusted_desktop_starter/ram_adjusted_desktop_starter b/usr/lib/ram_adjusted_desktop_starter/ram_adjusted_desktop_starter
@@ -21,6 +21,12 @@ exit_handler_rads() {
 
 trap "exit_handler_rads" EXIT
 
+sigint_handler_rads() {
+   exit 0
+}
+
+trap "sigint_handler_rads" EXIT
+
 colors() {
    if [ "$TERM" = "" ]; then
       return 0