QubesOS/qubes-linux-template-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reformatted script

Browse Source
This commit is contained in:
Jason Mehring 2015-02-10 10:07:44 -05:00
parent 14762b89e7
commit 60c1d07538
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
prepare_image
View File

@ -3,7 +3,7 @@
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# Configurations # Configurations
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
export IMG="$1" export IMG="${1}"
export LC_ALL=POSIX export LC_ALL=POSIX
RETCODE=0 RETCODE=0
@ -13,52 +13,55 @@ RETCODE=0
. ./builder_setup >/dev/null . ./builder_setup >/dev/null
. ./umount_kill.sh >/dev/null . ./umount_kill.sh >/dev/null
if [ "$VERBOSE" -ge 2 -o "$DEBUG" == "1" ]; then if [ "${VERBOSE}" -ge 2 -o "${DEBUG}" == "1" ]; then
set -x set -x
else else
set -e set -e
fi fi
if ! [ $# -eq 1 ]; then if ! [ $# -eq 1 ]; then
echo "usage $0 <img_file_name>" echo "usage ${0} <img_file_name>"
exit exit
fi fi
if [ "$VERBOSE" == "1" ]; then if [ "${VERBOSE}" == "1" ]; then
export YUM_OPTS="$YUM_OPTS -q" export YUM_OPTS="${YUM_OPTS} -q"
fi fi
# ------------------------------------------------------------------------------
# Make sure INSTALLDIR exists
# ------------------------------------------------------------------------------
export INSTALLDIR="$(readlink -m mnt)"
mkdir -p "${INSTALLDIR}"
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# Prepare for mount # Prepare for mount
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
echo "-> Preparing instalation of $DIST template..." echo "-> Preparing instalation of ${DIST} template..."
export INSTALLDIR="$(readlink -m mnt)" "${SCRIPTSDIR}/00_prepare.sh"
mkdir -p "$INSTALLDIR"
"$SCRIPTSDIR/00_prepare.sh"
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# Mount image and install core OS # Mount image and install core OS
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
if [ -f "${IMG}" ]; then
if [ -f "$IMG" ]; then
echo "-> Image file already exists, assuming *update*..." echo "-> Image file already exists, assuming *update*..."
else else
echo "-> Initializing empty image..." echo "-> Initializing empty image..."
truncate -s 10G "$IMG" || exit 1 truncate -s 10G "${IMG}" || exit 1
echo "-> Creating filesystem..." echo "-> Creating filesystem..."
mkfs.ext4 -q -F "$IMG" || exit 1 mkfs.ext4 -q -F "${IMG}" || exit 1
fi fi
mount -o loop "$IMG" "$INSTALLDIR" || exit 1 mount -o loop "${IMG}" "${INSTALLDIR}" || exit 1
trap "umount_kill $(readlink -m $INSTALLDIR)" EXIT trap "umount_kill $(readlink -m ${INSTALLDIR})" EXIT
"$SCRIPTSDIR/01_install_core.sh" "${SCRIPTSDIR}/01_install_core.sh"
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# Install package groups # Install package groups
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
echo "-> Installing package groups..." echo "-> Installing package groups..."
"$SCRIPTSDIR/02_install_groups.sh" "${SCRIPTSDIR}/02_install_groups.sh"
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# Cleanup # Cleanup
@ -66,6 +69,6 @@ echo "-> Installing package groups..."
trap - EXIT trap - EXIT
echo "-> Unmounting prepared_image..." echo "-> Unmounting prepared_image..."
umount_kill "$(readlink -m $INSTALLDIR)" || : umount_kill "$(readlink -m ${INSTALLDIR})" || true
exit $RETCODE exit ${RETCODE}