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.

bin/rc

@@ -1,70 +0,0 @@
-#!/bin/bash
-
-rc.hostname() { hostname "$cfg_hostname"; }
-
-rc.services_start() {
-	local service_name start_mode
-
-	for i in "${cfg_services[@]}"; do
-		unset service_name
-
-		[[ "$i" =~ ^@ ]] && {
-			service_name="${i##*@}"
-			start_mode='bg'
-		}
-
-		[[ "$i" =~ ^% ]] && {
-			service_name="${i##*%}"
-			start_mode='watch'
-		}
-
-		service_name=${service_name:-$i}
-		start_mode="${start_mode:-start}"
-		
-		case "$start_mode" in
-			bg) "${cfg_initscripts_dir}/$service_name" start &;;
-			watch) "${cfg_initscripts_dir}/$service_name" watch &;;
-			start) "${cfg_initscripts_dir}/$service_name" start;;
-			*) echo "Mode $start_mode not supported";;
-		esac
-	done
-}
-
-rc.services_stop() {
-	for i in "${cfg_services[@]}"; do
-		"${cfg_initscripts_dir}/$i" stop
-	done
-}
-
-rc.boot() {
-	rc.hostname
-	rc.modules
-	rc.services_start
-}
-
-rc.shutdown() {
-	rc.services_stop
-}
-
-rc.hostname() {
-	[[ "$cfg_hostname" ]] && { hostname "$cfg_hostname"; }
-}
-
-rc.modules() {
-	for i in "${cfg_modules[@]}"; do
-		modprobe "$i"
-	done
-}
-
-source "/etc/rc.conf"
-
-action="$1"
-action="${action:-boot}"
-
-case "$action" in
-	boot)
-		echo "Welcome to `uname -rs`"
-		rc.boot
-	;;
-	shutdown) rc.shutdown;;
-esac

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,17 +0,0 @@
-# System-wide configuration
-
-export PATH='/usr/local/bin:/usr/bin'
-
-# Where to look for initscripts
-cfg_initscripts_dir='/etc/rc.d'
-
-# Hostname
-cfg_hostname='changeme'
-
-# Services to start at boot time
-cfg_services+=( 'mount' 'udev' 'rc.local' ) # You probably do need these
-cfg_services+=( '@syslog-ng' '@crond' '@network' '@sshd' '@dbus' '@alsa' ) # Services starting with '@' start in background.
-cfg_services+=( %agetty-tty{2..6} ) # Do not modify this unless you know what you are doing!
-
-# Modules to be loaded at boot time. Most people don't need this
-#cfg_modules=( 'tun' )

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

@@ -0,0 +1,179 @@
+#!/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"}"; }
+
+rc.motd() {
+	[[ -f "/etc/rc.motd" ]] && {
+		while read; do
+			printf "$REPLY"
+		done < "/etc/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"
+
+		[[ "$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() {
+	[[ -f "/proc/cmdline" ]] && {
+		boot_cmdline=( $(</proc/cmdline) )
+	}
+
+	for i in "${boot_cmdline[@]}"; do
+		case "$i" in
+			init.single) rc.rescue;;
+		esac
+	done
+}
+
+rc.services_start() {
+	local service_name start_mode
+
+	for i in "${cfg_services[@]}"; do
+		unset service_name
+
+		[[ "$i" =~ ^@ ]] && {
+			service_name="${i##*@}"
+			start_mode='bg'
+		}
+
+		[[ "$i" =~ ^% ]] && {
+			service_name="${i##*%}"
+			start_mode='watch'
+		}
+
+		service_name=${service_name:-$i}
+		start_mode="${start_mode:-start}"
+		
+		case "$start_mode" in
+			bg) service "$service_name" start &;;
+			start) service "$service_name" start;;
+			*) echo "Mode $start_mode not supported";;
+		esac
+	done
+}
+
+rc.services_stop() {
+	echo "Stopping services..."
+	local service_name
+
+	for i in "${cfg_services[@]}"; do
+		service_name="${i##*@}"; service_name="${service_name##*%}"
+		service "$service_name" stop &>/dev/null &
+	done
+	wait
+}
+
+rc.stop_everything() {
+	echo "Politely asking all processes to shut down..."
+	killall5 -15; sleep 3
+
+	echo "Killing the remaning ones..."
+	killall5 -9
+}
+
+rc.unmount_everything() {
+	echo "Unmounting filesystems..."
+	umount -a
+}
+
+rc.remount_root() {
+	echo "Remounting / read-only..."
+	mount / -o remount,ro
+}
+
+rc.boot() {
+	rc.mount_misc
+	rc.tmpdirs
+	rc.hostname
+	rc.timezone
+	rc.modules
+	rc.services_start
+	wait
+	rc.motd
+}
+
+rc.halt() {
+	case "$action" in
+		poweroff|shutdown) echo 'o' > /proc/sysrq-trigger;;
+		halt) :;;
+		reboot|*) echo 'b' > /proc/sysrq-trigger;;
+	esac
+}
+
+rc.shutdown() {
+	rc.services_stop
+	rc.stop_everything
+	rc.unmount_everything
+	rc.remount_root
+
+	echo "Halt complete."
+	
+	rc.halt
+}
+
+rc.hostname() {
+	[[ "$cfg_hostname" ]] && { hostname "$cfg_hostname"; }
+}
+
+rc.modules() {
+	for i in "${cfg_modules[@]}"; do
+		modprobe "$i"
+	done
+}
+
+rc.timezone() {
+	[[ "$cfg_timezone" ]] && {
+		ln -fs "/usr/share/zoneinfo/${cfg_timezone}" /etc/localtime
+	}
+}
+
+rc.main() {
+	source "@ETC@/rc.conf"
+
+	action="${1:-boot}"
+
+	case "$action" in
+		boot)
+			echo "Welcome to `uname -rs`"
+			rc.boot
+		;;
+
+		poweroff|reboot|shutdown|halt)
+			rc.shutdown
+		;;
+	esac
+}
+
+# Main part
+rc.main "$@"

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 "$@"