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

Makefile

@@ -25,6 +25,7 @@ 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
 

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' ) # 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,29 +11,47 @@ 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"}"; }
 
 rc.motd() {
 	[[ -f "/etc/rc.motd" ]] && {
 		while read; do
-			printf "$REPLY"
+			printf "%s\n" "$REPLY"
 		done < "/etc/rc.motd"
 	}
 
 	return 0
 }
 
+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
+	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 m in "${cfg_mounts[@]}"; do
-		IFS=':' read fs fs_type mountpoint mount_options <<< "$m"
+		echo "$m" | while IFS=':' read fs fs_type mountpoint mount_options; do
+			[[ "$mount_options" ]] || { mount_options='defaults'; }
 
-		[[ "$mount_options" ]] || { mount_options='defaults'; }
+			mountpoint -q "$mountpoint" || {
-
+				[[ -d "$mountpoint" ]] || { mkdir -p "$mountpoint"; }
-		mountpoint -q "$mountpoint" || {
+				mount "$fs" -n -t "$fs_type" -o "$mount_options" "$mountpoint"
-			[[ -d "$mountpoint" ]] || { mkdir -p "$mountpoint"; }
+			}
-			mount "$fs" -n -t "$fs_type" -o "$mount_options" "$mountpoint"
+		done
-		}
 	done
 }
 
@@ -97,7 +115,7 @@ rc.stop_everything() {
 
 rc.unmount_everything() {
 	echo "Unmounting filesystems..."
-	umount -a
+	umount -r -a
 }
 
 rc.remount_root() {
@@ -107,7 +125,9 @@ rc.remount_root() {
 
 rc.boot() {
 	rc.mount_misc
+	rc.tmpfiles
 	rc.hostname
+	rc.timezone
 	rc.modules
 	rc.services_start
 	wait
@@ -125,6 +145,7 @@ rc.halt() {
 rc.shutdown() {
 	rc.services_stop
 	rc.stop_everything
+	sync
 	rc.unmount_everything
 	rc.remount_root
 
@@ -134,6 +155,7 @@ rc.shutdown() {
 }
 
 rc.hostname() {
+	[[ -f '/etc/hostname' ]] && { hostname "$(</etc/hostname)"; }
 	[[ "$cfg_hostname" ]] && { hostname "$cfg_hostname"; }
 }
 
@@ -143,6 +165,12 @@ rc.modules() {
 	done
 }
 
+rc.timezone() {
+	[[ "$cfg_timezone" ]] && {
+		ln -fs "/usr/share/zoneinfo/${cfg_timezone}" /etc/localtime
+	}
+}
+
 rc.main() {
 	source "@ETC@/rc.conf"
 
@@ -150,11 +178,11 @@ rc.main() {
 
 	case "$action" in
 		boot)
-			echo "Welcome to `uname -rs`"
+			echo "Welcome to $(uname -rs)"
 			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

@@ -13,10 +13,6 @@ get_my_tree() {
 	done
 }
 
-get_realname() {
-	readlink -e "$1"
-}
-
 get_all_procs() {
 	local processlist