uvol: clean up paths and fix delayed startup

* Winchester discs can take a long time to spin up which results in
   blockd also taking a while to complete to start.

 * Make sure uvol only gets started once blockd is ready.

 * Clean up paths (use '/tmp/run/uvol' everywhere instead of relying on
   the '/var' -> '/tmp' symlink)

 * Create 'apk' folder when initializing .meta volume.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

utils/uvol/files/common.sh

@@ -12,7 +12,7 @@ uvol_uci_add() {
 	local devname="$2"
 	local mode="$3"
 	local autofs=0
-	local target="/var/run/uvol/$volname"
+	local target="/tmp/run/uvol/$volname"
 	local uuid uciname
 
 	[ "$mode" = "ro" ] && autofs=1
@@ -24,7 +24,7 @@ uvol_uci_add() {
 
 	case "$uciname" in
 		"_meta")
-			target="/var/run/uvol/.meta"
+			target="/tmp/run/uvol/.meta"
 			;;
 		"_"*)
 			return 1

utils/uvol/files/uvol.defaults

@@ -12,6 +12,8 @@ uvol_init() {
 	[ "$metasz" -gt "$freesz" ] && return
 	uvol create .meta "$metasz" rw
 	uvol up .meta
+	grep -q "uvol/.meta" /proc/mounts || return
+	mkdir -p "/var/run/uvol/.meta/apk"
 }
 
 uci -q get fstab.@uvol[0].initialized >/dev/null || uvol_init

utils/uvol/files/uvol.init

@@ -13,8 +13,7 @@ start_service() {
 }
 
 boot() {
-	__BOOT_UVOL=1
+	__BOOT_UVOL=1 start
-	start
 }
 
 service_triggers() {