Merge branch 'master' of builder:git/spark-rc

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

@@ -1,6 +1,9 @@
-# System-wide configuration
+# A default PATH
 export PATH='/usr/local/bin:/usr/local/sbin:/usr/bin'
 
+# Locale
+export LC_ALL='en_US.UTF-8'
+
 # Hostname
 cfg_hostname='spark'
 
@@ -11,7 +14,7 @@ cfg_hostname='spark'
 # Services that start with @ are executed in parallel
 cfg_services+=(
 	'fsck' 'mount' 'sysctl' 'rsyslogd'
-	'@lo.iface' '@scron' '@agetty-tty{2..6}'
+	'@lo.iface' '@scron' @agetty-tty{2..6}
 )
 
 # Uncomment and add modules you want to be loaded at boot time here
@@ -25,7 +28,7 @@ cfg_mounts=(
 	'run:tmpfs:/run'
 	'tmp:tmpfs:/tmp'
 
-	'proc:proc:/proc'
+	'proc:proc:/proc:defaults,hidepid=2'
 	'sys:sysfs:/sys'
 
 	'dev:devtmpfs:/dev'

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
 }
@@ -120,10 +129,21 @@ rc.boot() {
 }
 
 rc.halt() {
+	if type -P halt; then
+		function rc.halt_poweroff { halt -p; }
+		function rc.halt_reboot { halt -r; }
+	elif [[ -f /proc/sysrq-trigger ]]; 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
 }