Merge branch 'feature/block-device-mounting' into feature/installer-integration

Conflicts:
	locale/en_US.sh

3 files changed, 72 insertions, 8 deletions

diff --git a/lib/block.sh b/lib/block.sh
index 7060690..d83572e 100644
--- a/lib/block.sh
+++ b/lib/block.sh
@@ -22,6 +22,7 @@
 _BLOCK_SM=1
 
 use rand
+use vardata
 
 is_block()
 {
@@ -31,25 +32,31 @@ is_block()
 	return ${?}
 }
 
-block_mount()
+check_block()
 {
 	local dev="${1}"
-	local dir=
 
 	if ! [ -b "${dev}" ]; then
 		error 2 "$(get_msg 'block_device_invalid')"
 	fi
+}
+
+block_mount()
+{
+	local dev="${1}"
+	local dir=
+
+	check_block "${dev}"
 
 	rand
-	# FIXME: Hardcoded tmpdir
-	dir="/tmp/prokit-block-$(printf '%010d' ${rand_x})"
+	dir="$(get_vardata_dir 'mount')/block-$(printf '%010d' ${rand_x})"
 	if ! mkdir "${dir}"; then
-		error 2 "$(get_msg 'block_mkdir_fail' "${dir}")"
+		error 2 "$(get_msg 'block_mkdir_fail')" "${dir}"
 	fi
 
 	if ! mount "${dev}" "${dir}"; then
 		rmdir "${dir}"
-		error 2 "$(get_msg 'block_mount_fail' "${dev}")"
+		error 2 "$(get_msg 'block_mount_fail')" "${dev}"
 	fi
 
 	printf '%s' "${dir}"
@@ -74,11 +81,11 @@ block_umount()
 	done
 
 	if ${timed_out}; then
-		error 2 "$(get_msg 'block_umount_fail' "${dir}")"
+		error 2 "$(get_msg 'block_umount_fail')" "${dir}"
 	fi
 
 	if ! rmdir "${dir}"; then
-		error 2 "$(get_msg 'block_rmdir_fail' "${dir}")"
+		error 2 "$(get_msg 'block_rmdir_fail')" "${dir}"
 	fi
 
 	return 0
diff --git a/lib/local.mk b/lib/local.mk
index 33127c2..a202aad 100644
--- a/lib/local.mk
+++ b/lib/local.mk
@@ -4,6 +4,7 @@ pkgdata_sources = \
 	lib/getopt.sh \
 	lib/fd.sh \
 	lib/dir.sh \
+	lib/vardata.sh \
 	lib/archplat.sh \
 	lib/deps.sh \
 	lib/substvars.sh \
diff --git a/lib/vardata.sh b/lib/vardata.sh
new file mode 100644
index 0000000..8800003
--- /dev/null
+++ b/lib/vardata.sh
@@ -0,0 +1,56 @@
+# Functions for getting variable/runtime data
+#
+# Copyright (C) 2015  Patrick "P. J." McDermott
+#
+# This file is part of the ProteanOS Development Kit.
+#
+# The ProteanOS Development Kit is free software: you can redistribute
+# it and/or modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# The ProteanOS Development Kit is distributed in the hope that it
+# will be useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with the ProteanOS Development Kit.  If not, see
+# <http://www.gnu.org/licenses/>.
+
+[ "x${_VARDATA_SM+set}" = 'xset' ] && return 0
+_VARDATA_SM=1
+
+PKGLOCALSTATEDIR='@pkglocalstatedir@'
+VARDATA_DIRS='mount'
+
+vardatadir=
+
+init_vardata()
+{
+	local dir=
+
+	if ${in_place}; then
+		vardatadir="${builddir}/var"
+		for dir in ${VARDATA_DIRS}; do
+			mkdir -p "${vardatadir}/${dir}"
+		done
+	else
+		vardatadir="${PKGLOCALSTATEDIR}"
+	fi
+
+	return 0
+}
+
+get_vardata_dir()
+{
+	local dir="${1}"
+
+	case " ${VARDATA_DIRS} " in
+		*" ${dir} "*)
+			printf '%s/%s' "${vardatadir}" "${dir}"
+			;;
+	esac
+
+	return 0
+}