parallelvirtualcluster
/
pvc-installer
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Flip the cached squashfs arg around

This commit is contained in:
Joshua Boniface 2019-06-15 14:27:19 -04:00
parent 3d4e25e3fe
commit ddbf2e8cca
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
buildiso.sh
View File

@ -25,17 +25,17 @@ show_help() {
echo -e " disk, partitioning, installing the base OS, and performing some initial" echo -e " disk, partitioning, installing the base OS, and performing some initial"
echo -e " configuration to allow the PVC Ansible role to take over after completion." echo -e " configuration to allow the PVC Ansible role to take over after completion."
echo echo
echo -e "Usage: $0 [-h] [-o <output_filename>] [-s <liveiso_source_url>]" echo -e "Usage: $0 [-h] [-o <output_filename>] [-s <liveiso_source_url>] [-a]"
echo echo
echo -e " -h: Display this help message." echo -e " -h: Display this help message."
echo -e " -o: Create the ISO as <output_filename> instead of the default." echo -e " -o: Create the ISO as <output_filename> instead of the default."
echo -e " -s: Obtain the source Debian Live ISO from <liveiso_source_url> instead of" echo -e " -s: Obtain the source Debian Live ISO from <liveiso_source_url> instead of"
echo -e " the default." echo -e " the default."
echo -e " -i: Ignore cached squashfs artifact during rebuild (ISO and debootstrap" echo -e " -a: Use cached squashfs artifact during rebuild (cached ISO and debootstrap"
echo -e " artifacts are never ignored)." echo -e " artifacts are always used)."
} }
while getopts "h?o:s:i" opt; do while getopts "h?o:s:a" opt; do
case "$opt" in case "$opt" in
h|\?) h|\?)
show_help show_help
@ -47,8 +47,8 @@ while getopts "h?o:s:i" opt; do
s) s)
srcliveisourl=$OPTARG srcliveisourl=$OPTARG
;; ;;
i) a)
ignorecachedsquashfs='y' usecachedsquashfs='y'
;; ;;
esac esac
done done
@ -120,7 +120,7 @@ prepare_rootfs() {
echo "done." echo "done."
echo -n "Generating squashfs image of live installation... " echo -n "Generating squashfs image of live installation... "
if [[ ! -f artifacts/filesystem.squashfs && -n ${ignorecachedsquashfs} ]]; then if [[ ! -f artifacts/filesystem.squashfs && -z ${usecachedsquashfs} ]]; then
sudo nice mksquashfs ${tempdir}/rootfs/ artifacts/filesystem.squashfs -e boot &>/dev/null || fail "Error generating squashfs." sudo nice mksquashfs ${tempdir}/rootfs/ artifacts/filesystem.squashfs -e boot &>/dev/null || fail "Error generating squashfs."
fi fi
sudo cp artifacts/filesystem.squashfs ${tempdir}/installer/live/filesystem.squashfs &>/dev/null || fail "Error copying squashfs to tempdir." sudo cp artifacts/filesystem.squashfs ${tempdir}/installer/live/filesystem.squashfs &>/dev/null || fail "Error copying squashfs to tempdir."