summary refs log tree commit diff
diff options
context:
space:
mode:
authorJuan RP <xtraeme@gmail.com>2014-08-16 17:27:41 +0200
committerJuan RP <xtraeme@gmail.com>2014-08-16 17:27:41 +0200
commit5f0e6c84ebf16a76c5420649b9112271e7f095a0 (patch)
tree476f62b540fa5e55ee127ee6ce5aee49ca7d2a7c
parent1f1eddd94d618f0e8cb109238aba8a891305b1ac (diff)
downloadrunit-void-5f0e6c84ebf16a76c5420649b9112271e7f095a0.tar.gz
runit-void-5f0e6c84ebf16a76c5420649b9112271e7f095a0.tar.xz
runit-void-5f0e6c84ebf16a76c5420649b9112271e7f095a0.zip
Fix shutdown regression introduced in 9022506f.
-rwxr-xr-x11
-rwxr-xr-x33
-rwxr-xr-xctrlaltdel3
3 files changed, 2 insertions, 5 deletions
diff --git a/1 b/1
index 1c87c06..bba2dd3 100755
--- a/1
+++ b/1
@@ -18,7 +18,6 @@ done
 dmesg >/var/log/dmesg.log
 
 mkdir -p /run/runit
-install -m100 /dev/null /run/runit/reboot
 install -m100 /dev/null /run/runit/stopit
 
 msg "Initialization complete, running stage 2...\n"
diff --git a/3 b/3
index e9593d4..98b61b7 100755
--- a/3
+++ b/3
@@ -8,8 +8,7 @@ detect_virt
 [ -r /etc/rc.conf ] && . /etc/rc.conf
 
 if [ -e /run/runit/reboot ]; then
-    touch /etc/runit/reboot
-    chmod 100 /etc/runit/reboot
+    chmod 100 /run/runit/reboot
 fi
 
 echo
diff --git a/ctrlaltdel b/ctrlaltdel
index af70ed6..7738067 100755
--- a/ctrlaltdel
+++ b/ctrlaltdel
@@ -7,5 +7,4 @@ MSG="System is going down..."
 touch /run/runit/reboot
 
 # Proceed with shutdown process
-touch /etc/runit/stopit
-chmod 100 /etc/runit/stopit && echo "$MSG" | wall
+echo "$MSG" | wall