From edc945a68cb7e2d74b6cdfa0de33bc382be70c2b Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Wed, 15 Jan 2020 11:31:06 +0300
Subject: sinit: remove pre shutdown hook

---
 core/sinit/checksums                 |  3 +--
 core/sinit/files/sinit.post.shutdown |  2 +-
 core/sinit/files/sinit.pre.shutdown  | 10 ----------
 core/sinit/sources                   |  1 -
 core/sinit/version                   |  2 +-
 5 files changed, 3 insertions(+), 15 deletions(-)
 delete mode 100644 core/sinit/files/sinit.pre.shutdown

(limited to 'core')

diff --git a/core/sinit/checksums b/core/sinit/checksums
index 56f24244..c9d5e84e 100644
--- a/core/sinit/checksums
+++ b/core/sinit/checksums
@@ -3,5 +3,4 @@ aaccd0515070545174bf962c462686e7719c02c68004bd0b350b98b4c78a90ba  sinit-1.1.tar.
 f638aaa23383da584d3a56347a8e279abdc7c9c521661ef54a5bc8b955c5632b  reboot
 d21a020d7cdb6a328962adac7cc1a8701a413c1dfabd40ac00bf7dc212fa29d1  poweroff
 93f3b06594447598af207f44f2dde126f05724fde0a405bd15dd0f446ff26c6f  sinit-launch-services.boot
-2ea497694bbf778a05bbece13bac32c8d8c0be36469fe80ccee32c1501fbb392  sinit.pre.shutdown
-2c161e2c97366e12c7994f832ee96f293485e6dd398a66070f8bd35949beb8e1  sinit.post.shutdown
+a6952fbe916d2b9756b7dfc59bc5313a7d3749b22c59ab4db88ea76d4d76f097  sinit.post.shutdown
diff --git a/core/sinit/files/sinit.post.shutdown b/core/sinit/files/sinit.post.shutdown
index 16deba74..ade9958f 100644
--- a/core/sinit/files/sinit.post.shutdown
+++ b/core/sinit/files/sinit.post.shutdown
@@ -8,7 +8,7 @@ if [ "$SINIT_SHUTDOWN_HOOKS" = 1 ]; then
 			out "Requesting system reboot..."
 			/usr/bin/ubase-box halt -r 
 			;;
-		poweroff) 
+		*) 
 			out "Requesting system poweroff..."
 			/usr/bin/ubase-box halt -p 
 			;;
diff --git a/core/sinit/files/sinit.pre.shutdown b/core/sinit/files/sinit.pre.shutdown
deleted file mode 100644
index af0d6f4f..00000000
--- a/core/sinit/files/sinit.pre.shutdown
+++ /dev/null
@@ -1,10 +0,0 @@
-if [ "$SINIT_SHUTDOWN_HOOKS" = 1 ]; then
-	case "$1" in
-		reboot|poweroff)
-			;;
-		*)
-			echo "Invalid action '$1' for rc.shutdown" 1>&2
-			exit 1
-			;;
-	esac
-fi
diff --git a/core/sinit/sources b/core/sinit/sources
index 34ee5bd1..2d3a4d86 100644
--- a/core/sinit/sources
+++ b/core/sinit/sources
@@ -3,5 +3,4 @@ files/config.h
 files/reboot
 files/poweroff
 files/sinit-launch-services.boot
-files/sinit.pre.shutdown
 files/sinit.post.shutdown
diff --git a/core/sinit/version b/core/sinit/version
index f8b0b375..08ad782f 100644
--- a/core/sinit/version
+++ b/core/sinit/version
@@ -1 +1 @@
-1.1 1
+1.1 2
-- 
cgit v1.2.3