build: unfactor setup_platform()

build/common.sh

@@ -132,6 +132,12 @@ setup_base()
 	# belongs to the base system, we create it from here.
 	mkdir -p ${1}/home
 
+	# /conf is needed for the config subsystem at this
+	# point as the storage location.  We ought to add
+	# this here, because otherwise read-only install
+	# media wouldn't be able to bootstrap the directory.
+	mkdir -p ${1}/conf
+
 	tar -C ${1} -Jxpf ${BASE_SET}
 
 	local BASE_VER=${BASE_SET##${SETSDIR}/base-}
@@ -188,14 +194,6 @@ setup_packages()
 	rm -rf ${BASEDIR}${PACKAGESDIR}/${ARCH}/*
 }
 
-setup_platform()
-{
-	echo ">>> Setting up platform in ${1}..."
-
-	# XXX clean this up further maybe?
-	mkdir -p ${1}/conf
-}
-
 setup_mtree()
 {
 	echo ">>> Creating mtree summary of files present..."

build/iso.sh

@@ -36,7 +36,6 @@ setup_base ${STAGEDIR}
 setup_kernel ${STAGEDIR}
 setup_packages ${STAGEDIR} opnsense
 setup_mtree ${STAGEDIR}
-setup_platform ${STAGEDIR}
 
 echo -n ">>> Building ISO image... "
 

build/memstick.sh

@@ -37,7 +37,6 @@ setup_base ${STAGEDIR}
 setup_kernel ${STAGEDIR}
 setup_packages ${STAGEDIR} opnsense
 setup_mtree ${STAGEDIR}
-setup_platform ${STAGEDIR}
 
 echo ">>> Building memstick image(s)..."
 

build/regress.sh

@@ -35,7 +35,6 @@ setup_stage ${STAGEDIR}
 setup_base ${STAGEDIR}
 setup_packages ${STAGEDIR} opnsense
 setup_clone ${STAGEDIR} ${COREDIR}
-setup_platform ${STAGEDIR}
 setup_chroot ${STAGEDIR}
 
 echo ">>> Running ${COREDIR} test suite..."