Use an indexed array for mount definitions

LICENSE

@@ -0,0 +1,13 @@
+Copyright (c) 2012-2014, Jack L. Frost <fbt@fleshless.org>
+
+
+Permission to use, copy, modify, and/or distribute this software for any purpose with or without
+fee is hereby granted, provided that the above copyright notice and this permission notice appear
+in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+OF THIS SOFTWARE.

Makefile

@@ -1,18 +1,21 @@
-# watchman makefile
+# spark-rc makefile
-VERSION=1.6.9
 
 # Please modify config.mk and not this
 sinclude config.mk
 
-.PHONY: clean install uninstall all
+.PHONY: clean install uninstall all tools
 
-build: rc
+build: rc tools
 
 all: build
 
+tools:
+	make -C tools
+
 rc: rc.in
 	sed -r \
 		-e 's%@ETC@%$(ETC)%' \
+		-e 's%@BASH_PATH@%$(BASH_PATH)%' \
 		rc.in > rc
 
 	chmod 750 $@
@@ -20,12 +23,21 @@ rc: rc.in
 clean:
 	rm rc
 
+	make -C tools clean
+
 install: build
 	install -dm755 $(BINDIR)
 	install -dm755 $(ETCDIR)
 
 	install -m750 rc $(BINDIR)/rc
 	install -m644 rc.conf $(ETCDIR)/rc.conf
+	install -m644 rc.motd $(ETCDIR)/rc.motd
+
+	install -m755 tools/killall5 $(BINDIR)/killall5
+
+	make -C tools install
 
 uninstall:
 	rm $(BINDIR)/rc
+
+	make -C tools uninstall

config.mk

@@ -4,5 +4,7 @@ USR ?= /usr/local
 ETC ?= /etc
 BIN ?= $(USR)/bin
 
+BASH_PATH ?= /bin/bash
+
 BINDIR = $(DESTDIR)$(PREFIX)$(BIN)
 ETCDIR = $(DESTDIR)$(PREFIX)$(ETC)

rc.conf

@@ -4,14 +4,18 @@ export PATH='/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin'
 # Hostname
 cfg_hostname='changeme'
 
-# Services
+# Timezone
-cfg_services+=( 'fsck' 'mount' 'systemd-udevd' 'sysctl' ) # Services that need tp be started in an order
+# Change this to yours
-cfg_services+=( @agetty-tty{2..6} ) # Comment this if your init starts something on the ttys itself.
+#cfg_timezone='Europe/Moscow'
-cfg_services+=( '@crond' '@network' '@dbus' '@alsa' ) # These start in parallel.
-cfg_services+=( 'rc.local' ) # Traditionally, rc.local starts last.
 
-# Modules
+# Services
-cfg_modules=(  ) # Add modules you want to be loaded at boot time here
+cfg_services+=( 'fsck' 'mount' 'sysctl' 'rsyslogd' ) # Services that need tp be started in an order
+cfg_services+=( '@lo.iface' '@scron' '@sshd' ) # These start in parallel.
+cfg_services+=( @agetty-tty{2..6} ) # Comment this if your init starts something on the ttys itself.
+cfg_services+=( 'rc.local' ) # Traditionally, rc.local starts last. Technically here it doesn't. Not quite :)
+
+# Add modules you want to be loaded at boot time here
+#cfg_modules=(  )
 
 # Make C-A-D perform a soft reset
 ctrlaltdel soft

rc.in

@@ -1,15 +1,30 @@
-#!/bin/bash
+#!@BASH_PATH@
+declare -A cfg_mounts
 
 # Default virtual mounts for linux systems
-cfg_mounts+=( 'proc:proc:/proc:' )
+cfg_mounts[proc]='proc:/proc'
-cfg_mounts+=( 'run:tmpfs:/run:' )
+cfg_mounts[run]='tmpfs:/run'
-cfg_mounts+=( 'sys:sysfs:/sys:' )
+cfg_mounts[sys]='sysfs:/sys'
 
 # devfs and its children
-cfg_mounts+=( 'dev:devtmpfs:/dev:' )
+cfg_mounts[dev]='devtmpfs:/dev'
-cfg_mounts+=( 'pts:devpts:/dev/pts:noexec,nosuid,gid=5,mode=0620' )
+cfg_mounts[pts]='devpts:/dev/pts:noexec,nosuid,gid=5,mode=0620'
-cfg_mounts+=( 'mqueue:mqueue:/dev/mqueue:noexec,nosuid,nodev' )
+cfg_mounts[mqueue]='mqueue:/dev/mqueue:noexec,nosuid,nodev'
-cfg_mounts+=( 'shm:tmpfs:/dev/shm:defaults,mode=0777' )
+cfg_mounts[shm]='tmpfs:/dev/shm:defaults,mode=0777'
+
+# Some temporary directories
+cfg_tmpdirs+=( '/run/lock' '/run/lock/lvm' '/run/lvm' '/run/user' )
+
+# And temporary files
+cfg_tmpfiles+=( '/run/utmp' )
+
+# Default XDG_RUNTIME_DIR for all non-system users
+# rtkit:x:133:133:RealtimeKit:/proc:/sbin/nologin
+while IFS=':' read -r _ _ uid gid _; do
+	if (( uid >= 1000 )); then
+		cfg_tmpdirs+=( "/run/user/$uid:700:$uid:$gid" )
+	fi
+done < /etc/passwd
 
 # Functions
 rc.rescue() { exec "${cfg_rc_rescue_shell:-"$SHELL"}"; }
@@ -17,23 +32,36 @@ rc.rescue() { exec "${cfg_rc_rescue_shell:-"$SHELL"}"; }
 rc.motd() {
 	[[ -f "/etc/rc.motd" ]] && {
 		while read; do
-			printf "$REPLY"
+			printf "%s\n" "$REPLY"
 		done < "/etc/rc.motd"
 	}
 
 	return 0
 }
 
+rc.tmpfiles() {
+	printf '%s\n' "${cfg_tmpdirs[@]}" | while IFS=':' read dir perm own grp; do
+		mkdir -pm "${perm:-755}" "$dir"
+		chown -c "${own:-root}:${grp:-root}" "$dir"
+	done
+
+	printf '%s\n' "${cfg_tmpfiles[@]}" | while IFS=':' read file perm own grp; do
+		> "$file"
+		chmod -c "${perm:-644}" "$file"
+		chown -c "${own:-root}:${grp:-root}" "$file"
+	done
+}
+
 rc.mount_misc() {
-	for m in "${cfg_mounts[@]}"; do
+	for fs in "${!cfg_mounts[@]}"; do
-		IFS=':' read fs fs_type mountpoint mount_options <<< "$m"
+		echo "$fs" | while IFS=':' read fs_type mountpoint mount_options; do
+			[[ "$mount_options" ]] || { mount_options='defaults'; }
 
-		[[ "$mount_options" ]] || { mount_options='defaults'; }
+			mountpoint -q "$mountpoint" || {
-
+				[[ -d "$mountpoint" ]] || { mkdir -p "$mountpoint"; }
-		mountpoint -q "$mountpoint" || {
+				mount "$fs" -n -t "$fs_type" -o "$mount_options" "$mountpoint"
-			[[ -d "$mountpoint" ]] || { mkdir -p "$mountpoint"; }
+			}
-			mount "$fs" -n -t "$fs_type" -o "$mount_options" "$mountpoint"
+		done
-		}
 	done
 }
 
@@ -97,7 +125,7 @@ rc.stop_everything() {
 
 rc.unmount_everything() {
 	echo "Unmounting filesystems..."
-	umount -a
+	umount -r -a
 }
 
 rc.remount_root() {
@@ -107,7 +135,9 @@ rc.remount_root() {
 
 rc.boot() {
 	rc.mount_misc
+	rc.tmpfiles
 	rc.hostname
+	rc.timezone
 	rc.modules
 	rc.services_start
 	wait
@@ -122,9 +152,14 @@ rc.halt() {
 	esac
 }
 
+rc.sync() {
+	echo "Syncing disks."
+}
+
 rc.shutdown() {
 	rc.services_stop
 	rc.stop_everything
+	rc.sync
 	rc.unmount_everything
 	rc.remount_root
 
@@ -134,6 +169,7 @@ rc.shutdown() {
 }
 
 rc.hostname() {
+	[[ -f '/etc/hostname' ]] && { hostname "$(</etc/hostname)"; }
 	[[ "$cfg_hostname" ]] && { hostname "$cfg_hostname"; }
 }
 
@@ -143,6 +179,12 @@ rc.modules() {
 	done
 }
 
+rc.timezone() {
+	[[ "$cfg_timezone" ]] && {
+		ln -fs "/usr/share/zoneinfo/${cfg_timezone}" /etc/localtime
+	}
+}
+
 rc.main() {
 	source "@ETC@/rc.conf"
 
@@ -150,11 +192,11 @@ rc.main() {
 
 	case "$action" in
 		boot)
-			echo "Welcome to `uname -rs`"
+			echo "Welcome to $(uname -rs)"
 			rc.boot
 		;;
 
-		poweroff|reboot|shutdown)
+		poweroff|reboot|shutdown|halt)
 			rc.shutdown
 		;;
 	esac

rc.motd

@@ -0,0 +1 @@
+Boot finished. Switch to tty2 to login.

tools/Makefile

@@ -0,0 +1,29 @@
+# spark-rc tools makefile
+
+# Please modify config.mk and not this
+sinclude ../config.mk
+
+.PHONY: clean install uninstall all
+
+build: killall5
+
+all: build
+
+killall5: killall5.in
+	sed -r \
+		-e 's%@BASH_PATH@%$(BASH_PATH)%' \
+		killall5.in > killall5
+
+	chmod 750 $@
+
+clean:
+	rm killall5
+
+install: build
+	install -dm755 $(BINDIR)
+	install -dm755 $(ETCDIR)
+
+	install -m750 killall5 $(BINDIR)/killall5
+
+uninstall:
+	rm $(BINDIR)/killall5

tools/killall5.in

@@ -0,0 +1,52 @@
+#!@BASH_PATH@
+# A simple reimplementation of killall5 from sysvinit-tools
+
+get_my_tree() {
+	local my_pid
+	read my_pid garbage < "/proc/self/stat"
+	child="$my_pid"
+
+	while [[ "$parent" != 1 ]]; do
+		read a b c parent d < "/proc/$child/stat";
+		child="$parent"
+		echo "$parent"
+	done
+}
+
+get_all_procs() {
+	local processlist
+
+	for i in /proc/*/exe; do
+		process_dir="${i%/*}"
+		process_pid="${process_dir##*/}"
+
+		readlink -e "$i" &>/dev/null && {
+			echo "$process_pid"
+		}
+	done
+}
+
+get_procs_to_kill() {
+	for i in "${all_procs[@]}"; do
+		unset skip
+		for p in "${my_tree[@]}"; do
+			[[ "$i" == "$p" ]] && { skip=1; }
+		done
+
+		[[ "$skip" ]] || { echo "$i"; }
+	done
+}
+
+main() {
+	my_tree=( $(get_my_tree) self thread-self )
+	all_procs=( $(get_all_procs) )
+	procs_to_kill=( $(get_procs_to_kill) )
+
+	signal="${1:-"-15"}"
+
+	kill "$signal" "${procs_to_kill[@]}" 2>/dev/null
+
+	return 0
+}
+
+main "$@"