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

@@ -0,0 +1,33 @@
+# spark-rc makefile
+
+# Please modify config.mk and not this
+sinclude config.mk
+
+.PHONY: clean install uninstall all
+
+build: rc
+
+all: build
+
+rc: rc.in
+	sed -r \
+		-e 's%@ETC@%$(ETC)%' \
+		rc.in > rc
+
+	chmod 750 $@
+
+clean:
+	rm rc
+
+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
+
+uninstall:
+	rm $(BINDIR)/rc

README.md

@@ -1,4 +1,4 @@
 spark-rc
 ========
 
-An example rc to use with spark (or not)
+A simple rc script to kickstart your system.

config.mk

@@ -0,0 +1,8 @@
+# Make config
+
+USR ?= /usr/local
+ETC ?= /etc
+BIN ?= $(USR)/bin
+
+BINDIR = $(DESTDIR)$(PREFIX)$(BIN)
+ETCDIR = $(DESTDIR)$(PREFIX)$(ETC)

etc/rc.conf

@@ -1,12 +0,0 @@
-# System-wide configuration
-export PATH='/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin'
-
-# Hostname
-cfg_hostname='changeme'
-
-# Services
-cfg_services+=( 'fsck' 'mount' 'udev' 'sysctl' 'rc.local' )
-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_modules=(  ) # Add modules you want to be loaded at boot time here

rc.conf

@@ -0,0 +1,21 @@
+# System-wide configuration
+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+=( '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,5 +1,19 @@
 #!/bin/bash
 
+# Default virtual mounts for linux systems
+cfg_mounts+=( 'proc:proc:/proc:' )
+cfg_mounts+=( 'run:tmpfs:/run:' )
+cfg_mounts+=( 'sys:sysfs:/sys:' )
+
+# devfs and its children
+cfg_mounts+=( 'dev:devtmpfs:/dev:' )
+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"}"; }
 
@@ -13,23 +27,21 @@ rc.motd() {
 	return 0
 }
 
-rc.mount() {
+rc.tmpdirs() {
-	local fs
+	mkdir -p -m0755 "${cfg_tmpdirs[@]}"
-	local fs_type
-	local mountpoint
-	local mount_options
-	
-	fs="$1"
-	fs_type="$2"
-	mountpoint="$3"
-	mount_options="${4:-defaults}"
-
-	mount "$1" -n -t "$2" -o "$mount_options" "$3"
 }
 
 rc.mount_misc() {
-	mountpoint -q /proc || { rc.mount proc proc /proc; }
+	for m in "${cfg_mounts[@]}"; do
-	mountpoint -q /dev || { rc.mount dev devtmpfs /dev; }
+		IFS=':' read fs fs_type mountpoint mount_options <<< "$m"
+
+		[[ "$mount_options" ]] || { mount_options='defaults'; }
+
+		mountpoint -q "$mountpoint" || {
+			[[ -d "$mountpoint" ]] || { mkdir -p "$mountpoint"; }
+			mount "$fs" -n -t "$fs_type" -o "$mount_options" "$mountpoint"
+		}
+	done
 }
 
 rc.parse_cmdline() {
@@ -84,10 +96,10 @@ rc.services_stop() {
 
 rc.stop_everything() {
 	echo "Politely asking all processes to shut down..."
-	/opt/sbase/bin/killall5 -s 15; sleep 3
+	killall5 -15; sleep 3
 
 	echo "Killing the remaning ones..."
-	/opt/sbase/bin/killall5 -s 9
+	killall5 -9
 }
 
 rc.unmount_everything() {
@@ -102,7 +114,9 @@ rc.remount_root() {
 
 rc.boot() {
 	rc.mount_misc
+	rc.tmpdirs
 	rc.hostname
+	rc.timezone
 	rc.modules
 	rc.services_start
 	wait
@@ -138,8 +152,14 @@ rc.modules() {
 	done
 }
 
+rc.timezone() {
+	[[ "$cfg_timezone" ]] && {
+		ln -fs "/usr/share/zoneinfo/${cfg_timezone}" /etc/localtime
+	}
+}
+
 rc.main() {
-	source "/etc/rc.conf"
+	source "@ETC@/rc.conf"
 
 	action="${1:-boot}"
 
@@ -149,9 +169,8 @@ rc.main() {
 			rc.boot
 		;;
 
-		poweroff|reboot|shutdown)
+		poweroff|reboot|shutdown|halt)
 			rc.shutdown
-			rc.halt
 		;;
 	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 "$@"