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

rc.in

@@ -31,13 +31,14 @@ rc.motd() {
 }
 
 rc.tmpfiles() {
-	printf '%s\n' "${cfg_tmpdirs[@]}" | while IFS=':' read dir perm; do
+	printf '%s\n' "${cfg_tmpdirs[@]}" | while IFS=':' read dir perm own grp; do
-		mkdir -v -m "${perm:-755}" "$dir"
+		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; do
+	printf '%s\n' "${cfg_tmpfiles[@]}" | while IFS=':' read file perm own grp; do
 		> "$file"
-		chmod -v "${perm:-644}" "$file"
+		chmod -c "${perm:-644}" "$file"
+		chown -c "${own:-root}:${grp:-root}" "$file"
 	done
 }
 
@@ -144,6 +145,7 @@ rc.halt() {
 rc.shutdown() {
 	rc.services_stop
 	rc.stop_everything
+	sync
 	rc.unmount_everything
 	rc.remount_root