default timeout in the config

Signed-off-by: fbt <fbt@fleshless.org>

README.md

@@ -1,4 +1,7 @@
-spark-rc
+# spark-rc
-========
 
 A simple rc script to kickstart your system.
+
+## depends
+
+* Enabled sysrq or halt from suckless.org's ubase.

rc.conf

@@ -40,3 +40,6 @@ cfg_mounts=(
 # Some temporary directories and files
 cfg_tmpdirs+=( '/run/lock' '/run/lock/lvm' '/run/lvm' '/run/user' )
 cfg_tmpfiles+=( '/run/utmp' )
+
+# How long do we wait for all processes to die nicely?
+cfg_killall5_timeout=30

rc.in

@@ -1,4 +1,5 @@
 #!@BASH_PATH@
+# vim: ft=zsh
 
 # Functions
 rc.rescue() { exec "${cfg_rc_rescue_shell:-"$SHELL"}"; }
@@ -29,13 +30,21 @@ rc.tmpfiles() {
 rc.mount() {
 	for fs in "${cfg_mounts[@]}"; do
 		echo "$fs" | while IFS=':' read device fs_type mountpoint mount_options; do
+			if mountpoint -q "$mountpoint"; then
+				if [[ "$mount_options" ]]; then
+					mount -o "remount,$mount_options" "$mountpoint"
+				fi
+			else
+				if ! [[ -d "$mountpoint" ]]; then
+					mkdir -p "$mountpoint"
+				fi
 
-			[[ "$mount_options" ]] || { mount_options='defaults'; }
+				if ! [[ "$mount_options" ]]; then
+					mount_options='defaults'
+				fi
 
-			mountpoint -q "$mountpoint" || {
-				[[ -d "$mountpoint" ]] || { mkdir -p "$mountpoint"; }
 				mount "$device" -n -t "$fs_type" -o "$mount_options" "$mountpoint"
-			}
+			fi
 		done
 	done
 }
@@ -92,10 +101,10 @@ rc.services_stop() {
 
 rc.stop_everything() {
 	echo "Politely asking all processes to shut down..."
-	killall5 -15; sleep 3
+	killall5 -s 15 -w "$cfg_killall5_timeout"
 
 	echo "Killing the remaning ones..."
-	killall5 -9
+	killall5 -s 9
 }
 
 rc.unmount_everything() {
@@ -120,10 +129,21 @@ rc.boot() {
 }
 
 rc.halt() {
+	if type -P halt &>/dev/null; then
+		function rc.halt_poweroff { halt -p; }
+		function rc.halt_reboot { halt -r; }
+	elif (( $(</proc/sys/kernel/sysrq) )); then
+		function rc.halt_poweroff { echo 'o' > /proc/sysrq-trigger; }
+		function rc.halt_reboot { echo 'b' > /proc/sysrq-trigger; }
+	else
+		printf 'Cannot halt, please install halt from suckless.org ubase or enable sysrq.\n'
+		return 1
+	fi
+
 	case "$action" in
-		poweroff|shutdown) echo 'o' > /proc/sysrq-trigger;;
 		halt) :;;
-		reboot|*) echo 'b' > /proc/sysrq-trigger;;
+		poweroff|shutdown) rc.halt_poweroff;;
+		reboot|*) rc.halt_reboot;;
 	esac
 }
 

tools/killall5.in

@@ -37,14 +37,60 @@ get_procs_to_kill() {
 	done
 }
 
+pids_exist() {
+	for i in "$@"; do
+		if kill -0 "$i" 2>/dev/null; then
+			return 0
+		fi
+	done
+
+	return 1
+}
+
+pid_wait() {
+	declare counter
+
+	while pids_exist "$@"; do
+		if (( counter == timeout )); then
+			return 1
+		fi
+
+		sleep 1
+
+		(( counter++ ))
+	done
+}
+
 main() {
+	timeout=30
+	signal=15
+
+	while (( $# )); do
+		case $1 in
+			-w)
+				flag_wait=1
+				timeout=$2
+				shift
+			;;
+
+			-s)
+				signal=$2
+				shift
+			;;
+		esac
+
+		shift
+	done
+
 	my_tree=( $(get_my_tree) self thread-self )
 	all_procs=( $(get_all_procs) )
 	procs_to_kill=( $(get_procs_to_kill) )
 
-	signal="${1:-"-15"}"
+	kill -n "$signal" "${procs_to_kill[@]}" 2>/dev/null
 
-	kill "$signal" "${procs_to_kill[@]}" 2>/dev/null
+	if (( flag_wait )); then
+		pid_wait "${procs_to_kill[@]}"
+	fi
 
 	return 0
 }