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

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' '@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+=( '@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

@@ -108,6 +108,7 @@ rc.remount_root() {
 rc.boot() {
 	rc.mount_misc
 	rc.hostname
+	rc.timezone
 	rc.modules
 	rc.services_start
 	wait
@@ -143,6 +144,12 @@ rc.modules() {
 	done
 }
 
+rc.timezone() {
+	[[ "$cfg_timezone" ]] && {
+		ln -fs "/usr/share/zoneinfo/${cfg_timezone}" /etc/localtime
+	}
+}
+
 rc.main() {
 	source "@ETC@/rc.conf"
 
@@ -154,7 +161,7 @@ rc.main() {
 			rc.boot
 		;;
 
-		poweroff|reboot|shutdown)
+		poweroff|reboot|shutdown|halt)
 			rc.shutdown
 		;;
 	esac

tools/killall5

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