agettys

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,6 +23,8 @@ rc: rc.in
 clean:
 	rm rc
 
+	make -C tools clean
+
 install: build
 	install -dm755 $(BINDIR)
 	install -dm755 $(ETCDIR)
@@ -29,5 +35,9 @@ install: build
 
 	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

@@ -1,21 +1,39 @@
 # System-wide configuration
-export PATH='/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin'
+export PATH='/usr/local/bin:/usr/local/sbin:/usr/bin'
 
 # Hostname
-cfg_hostname='changeme'
+cfg_hostname='spark'
 
 # Timezone
-# Change this to yours
+# Uncomment and change this to yours
 #cfg_timezone='Europe/Moscow'
 
-# Services
+# Services that start with @ are executed in parallel
-cfg_services+=( 'fsck' 'mount' 'sysctl' 'rsyslogd' ) # Services that need tp be started in an order
+cfg_services+=(
-cfg_services+=( '@lo.iface' '@scron' '@sshd' ) # These start in parallel.
+	'fsck' 'mount' 'sysctl' 'rsyslogd'
-cfg_services+=( @agetty-tty{2..6} ) # Comment this if your init starts something on the ttys itself.
+	'@lo.iface' '@scron' '@agetty-tty{2..6}'
-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
+# Uncomment and add modules you want to be loaded at boot time here
 #cfg_modules=(  )
 
 # Make C-A-D perform a soft reset
 ctrlaltdel soft
+
+# Virtual filesystems
+cfg_mounts=(
+	'run:tmpfs:/run'
+	'tmp:tmpfs:/tmp'
+
+	'proc:proc:/proc'
+	'sys:sysfs:/sys'
+
+	'dev:devtmpfs:/dev'
+	'pts:devpts:/dev/pts:noexec,nosuid,gid=5,mode=0620'
+	'mqueue:mqueue:/dev/mqueue:noexec,nosuid,nodev'
+	'shm:tmpfs:/dev/shm:defaults,mode=0777'
+)
+
+# Some temporary directories and files
+cfg_tmpdirs+=( '/run/lock' '/run/lock/lvm' '/run/lvm' '/run/user' )
+cfg_tmpfiles+=( '/run/utmp' )

rc.in

@@ -1,21 +1,4 @@
-#!/bin/bash
+#!@BASH_PATH@
-
-# 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' )
-
-# And temporary files
-cfg_tmpfiles+=( '/run/utmp' )
 
 # Functions
 rc.rescue() { exec "${cfg_rc_rescue_shell:-"$SHELL"}"; }
@@ -32,7 +15,8 @@ rc.motd() {
 
 rc.tmpfiles() {
 	printf '%s\n' "${cfg_tmpdirs[@]}" | while IFS=':' read dir perm own grp; do
-		install -v -d -m "${perm:-755}" -o "${own:-root}" -g "${grp:-root}" "$dir" 2>/dev/null
+		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
@@ -42,14 +26,15 @@ rc.tmpfiles() {
 	done
 }
 
-rc.mount_misc() {
+rc.mount() {
-	for m in "${cfg_mounts[@]}"; do
+	for fs in "${cfg_mounts[@]}"; do
-		echo "$m" | while IFS=':' read fs fs_type mountpoint mount_options; do
+		echo "$fs" | while IFS=':' read device fs_type mountpoint mount_options; do
+
 			[[ "$mount_options" ]] || { mount_options='defaults'; }
 
 			mountpoint -q "$mountpoint" || {
 				[[ -d "$mountpoint" ]] || { mkdir -p "$mountpoint"; }
-				mount "$fs" -n -t "$fs_type" -o "$mount_options" "$mountpoint"
+				mount "$device" -n -t "$fs_type" -o "$mount_options" "$mountpoint"
 			}
 		done
 	done
@@ -124,7 +109,7 @@ rc.remount_root() {
 }
 
 rc.boot() {
-	rc.mount_misc
+	rc.mount
 	rc.tmpfiles
 	rc.hostname
 	rc.timezone
@@ -178,6 +163,14 @@ rc.timezone() {
 rc.main() {
 	source "@ETC@/rc.conf"
 
+	# 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
+
 	action="${1:-boot}"
 
 	case "$action" in

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() {