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

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,5 +1,4 @@
-# watchman makefile
+# spark-rc makefile
-VERSION=1.6.9
 
 # Please modify config.mk and not this
 sinclude config.mk
@@ -26,6 +25,9 @@ install: build
 
 	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
 
 uninstall:
 	rm $(BINDIR)/rc

rc.conf

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

@@ -11,6 +11,9 @@ cfg_mounts+=( 'pts:devpts:/dev/pts:noexec,nosuid,gid=5,mode=0620' )
 cfg_mounts+=( 'mqueue:mqueue:/dev/mqueue:noexec,nosuid,nodev' )
 cfg_mounts+=( 'shm:tmpfs:/dev/shm:defaults,mode=0777' )
 
+# Some temporary directories
+cfg_tmpdirs+=( '/run/lock' '/run/lock/lvm' '/run/lvm' '/run/user' )
+
 # Functions
 rc.rescue() { exec "${cfg_rc_rescue_shell:-"$SHELL"}"; }
 
@@ -24,6 +27,10 @@ rc.motd() {
 	return 0
 }
 
+rc.tmpdirs() {
+	mkdir -p -m0755 "${cfg_tmpdirs[@]}"
+}
+
 rc.mount_misc() {
 	for m in "${cfg_mounts[@]}"; do
 		IFS=':' read fs fs_type mountpoint mount_options <<< "$m"
@@ -107,7 +114,9 @@ rc.remount_root() {
 
 rc.boot() {
 	rc.mount_misc
+	rc.tmpdirs
 	rc.hostname
+	rc.timezone
 	rc.modules
 	rc.services_start
 	wait
@@ -143,6 +152,12 @@ rc.modules() {
 	done
 }
 
+rc.timezone() {
+	[[ "$cfg_timezone" ]] && {
+		ln -fs "/usr/share/zoneinfo/${cfg_timezone}" /etc/localtime
+	}
+}
+
 rc.main() {
 	source "@ETC@/rc.conf"
 
@@ -154,7 +169,7 @@ rc.main() {
 			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/killall5

@@ -0,0 +1,52 @@
+#!/usr/bin/env bash
+# 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 "$@"