svn commit: r264652 - projects/release-embedded/release/cloudware

[Glen Barber]

Author: gjb
Date: Fri Apr 18 16:14:31 2014
New Revision: 264652
URL: http://svnweb.freebsd.org/changeset/base/264652

Log:
  Revert r264649.
  
  The md(4) mount and install are done remotely, not locally.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-embedded/release/cloudware/ec2.conf
  projects/release-embedded/release/cloudware/release-ec2.sh

Modified: projects/release-embedded/release/cloudware/ec2.conf
==============================================================================
--- projects/release-embedded/release/cloudware/ec2.conf	Fri Apr 18 16:05:12 2014	(r264651)
+++ projects/release-embedded/release/cloudware/ec2.conf	Fri Apr 18 16:14:31 2014	(r264652)
@@ -6,21 +6,4 @@
 
 # Configuration file for Amazon EC2 AMI builds.
 
-## Set to a non-empty value if the release build was not done
-## in a chroot(8), or we are already inside the chroot(8).
-#TGTISCHROOT=
-
-## Set to the directory the release bits have been installed.
-#RELDIR="/R"
-
-## Set to the directory the EC2 work directory.
-#EC2DIR="/EC2"
-
-## Set to the backing vnode file for the md(4) disk.
-#EC2IMG="${EC2DIR}/ec2.img"
-
-## Set to the size of the backing image file.  See truncate(1)
-## for valid syntax.
-#EC2SIZE="25G"
-
 return 0

Modified: projects/release-embedded/release/cloudware/release-ec2.sh
==============================================================================
--- projects/release-embedded/release/cloudware/release-ec2.sh	Fri Apr 18 16:05:12 2014	(r264651)
+++ projects/release-embedded/release/cloudware/release-ec2.sh	Fri Apr 18 16:14:31 2014	(r264652)
@@ -41,52 +41,14 @@ RELENGDIR="$(realpath $(dirname $(basena
 
 # Default settings if a configuration file is not specified:
 CHROOTDIR="/scratch"
-RELDIR="/R"
-EC2DIR="/EC2"
-EC2IMG="${EC2DIR}/ec2.img"
-EC2SIZE="25G"
 CONF="${RELENGDIR}/ec2.conf"
-TGTISCHROOT=1
 
 usage() {
 	echo "${0} [-c /path/to/configuration/file]"
 	exit 1
 }
 
-err() {
-	echo "$@"
-	exit 1
-}
-
-_chroot() {
-	if [ -n "${TGTISCHROOT}" ]; then
-		eval chroot ${CHROOTDIR} "$@"
-	else
-		eval "$@"
-	fi
-	return $?
-}
-
-diskbuild() {
-	if [ -n "${TGTISCHROOT}" ]; then
-		test -d ${CHROOTDIR} || \
-			err "Chroot directory ${CHROOTDIR} missing."
-	fi
-	_chroot mkdir -p ${RELDIR} || \
-		err "Could not create directory ${RELDIR}"
-	_chroot mkdir -p ${EC2DIR} || \
-		err "Could not create directory ${EC2DIR}"
-	_chroot test -e ${EC2IMG} && \
-		err "Image file ${EC2IMG} already exists."
-	_chroot truncate -s ${EC2SIZE} ${EC2IMG} || \
-		err "Could not create file ${EC2IMG}"
-	mddev=$(_chroot mdconfig -a -t vnode -f ${EC2IMG}) || \
-		err "Could not attach ${EC2IMG} to md(4)."
-
-	_chroot mdconfig -d -u ${mddev}
-	return 0
-}
-
+diskbuild() {}
 imagebuild() {}
 pushami() {}
 
@@ -103,8 +65,6 @@ main() {
 	done
 	shift $(( ${OPTIND} - 1 ))
 	. ${CONF}
-
-	diskbuild
 }
 
 main "$@"