X-Git-Url: https://iankelling.org/git/?p=automated-distro-installer;a=blobdiff_plain;f=fai-revm;h=4009ede6e37a081ab7da6d631dd25c69da5534e1;hp=5ea9d98ca77ca34b1fdb081f3edcf389881083c7;hb=99439572819ac875b329189d7b9162a5bb8bc805;hpb=c820c35e71e31c33de6743f8d225f7c5cd71a70f diff --git a/fai-revm b/fai-revm index 5ea9d98..4009ede 100755 --- a/fai-revm +++ b/fai-revm @@ -35,7 +35,8 @@ Note, sometimes shutting down the existing demohost vm fails. Just run again if that happens. -r Do not boot after install is complete --n Create new qcow2(s) for vm +-n Create new qcow2(s) for vm. Good for testing partitioning + script, to ensure a blank disk. -h|--help Print help and exit. Note: Uses GNU getopt options parsing style @@ -43,6 +44,7 @@ EOF exit $1 } +orig_args=("$@") new_disk=false temp=$(getopt -l help hnr "$@") || usage 1 eval set -- "$temp" @@ -56,7 +58,6 @@ while true; do esac done - # change this to test different disk counts. 1 and > 1 should be the only # important things to test. disk_count=1 @@ -68,7 +69,7 @@ if [[ $script_dir == /a/bin/* ]]; then rm -rf /tmp/faifreeze mkdir -p /a/tmp cp -ar /a/bin/fai /tmp/faifreeze - exec /tmp/faifreeze/${BASH_SOURCE##*/} "$@" + exec /tmp/faifreeze/${BASH_SOURCE##*/} "${orig_args[@]}" fi cd $script_dir @@ -107,7 +108,7 @@ for ((i=1; i <= disk_count; i++)); do disk_arg+=("--disk path=$f") if $new_disk || [[ ! -e $f ]]; then s rm -f $f - e s qemu-img create -o preallocation=metadata -f qcow2 $f 20G + e s qemu-img create -o preallocation=metadata -f qcow2 $f 50G fi done