oops

Makefile

@@ -3,15 +3,19 @@
 # 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 $@
@@ -19,14 +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

@@ -5,16 +5,17 @@ export PATH='/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin'
 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+=( '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+=( '@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

@@ -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,17 +32,29 @@ 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.mount_misc() {
+rc.tmpfiles() {
-	for m in "${cfg_mounts[@]}"; do
+	printf '%s\n' "${cfg_tmpdirs[@]}" | while IFS=':' read dir perm own grp; do
-		IFS=':' read fs fs_type mountpoint mount_options <<< "$m"
+		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 fs in "${!cfg_mounts[@]}"; do
+		echo "${cfg_mounts[$fs]}" | while IFS=':' read fs_type mountpoint mount_options; do
 			[[ "$mount_options" ]] || { mount_options='defaults'; }
 
 			mountpoint -q "$mountpoint" || {
@@ -35,6 +62,7 @@ rc.mount_misc() {
 				mount "$fs" -n -t "$fs_type" -o "$mount_options" "$mountpoint"
 			}
 		done
+	done
 }
 
 rc.parse_cmdline() {
@@ -97,7 +125,7 @@ rc.stop_everything() {
 
 rc.unmount_everything() {
 	echo "Unmounting filesystems..."
-	umount -a
+	umount -r -a
 }
 
 rc.remount_root() {
@@ -107,6 +135,7 @@ rc.remount_root() {
 
 rc.boot() {
 	rc.mount_misc
+	rc.tmpfiles
 	rc.hostname
 	rc.timezone
 	rc.modules
@@ -123,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
 
@@ -135,6 +169,7 @@ rc.shutdown() {
 }
 
 rc.hostname() {
+	[[ -f '/etc/hostname' ]] && { hostname "$(</etc/hostname)"; }
 	[[ "$cfg_hostname" ]] && { hostname "$cfg_hostname"; }
 }
 
@@ -157,7 +192,7 @@ rc.main() {
 
 	case "$action" in
 		boot)
-			echo "Welcome to `uname -rs`"
+			echo "Welcome to $(uname -rs)"
 			rc.boot
 		;;
 

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

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!@BASH_PATH@
 # A simple reimplementation of killall5 from sysvinit-tools
 
 get_my_tree() {
@@ -13,10 +13,6 @@ get_my_tree() {
 	done
 }
 
-get_realname() {
-	readlink -e "$1"
-}
-
 get_all_procs() {
 	local processlist