mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-23 06:31:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

qemu_template: shell lint and update

Browse Source 
Signed-off-by: Vincent Batts <vbatts@kinvolk.io>
This commit is contained in:
Vincent Batts 2020-09-15 17:49:33 -04:00
parent a22f316c23
commit ed7de96c1f
No known key found for this signature in database
GPG Key ID: 524F155275DF0C3E
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build_library/qemu_template.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
SCRIPT_DIR="`dirname "$0"`" SCRIPT_DIR="$(dirname "$0")"
VM_BOARD= VM_BOARD=
VM_NAME= VM_NAME=
VM_UUID= VM_UUID=
@ -11,7 +11,7 @@ VM_MEMORY=
VM_CDROM= VM_CDROM=
VM_PFLASH_RO= VM_PFLASH_RO=
VM_PFLASH_RW= VM_PFLASH_RW=
VM_NCPUS="`grep -c ^processor /proc/cpuinfo`" VM_NCPUS="$(nproc)"
SSH_PORT=2222 SSH_PORT=2222
SSH_KEYS="" SSH_KEYS=""
CLOUD_CONFIG_FILE="" CLOUD_CONFIG_FILE=""
@ -112,10 +112,12 @@ write_ssh_keys() {
if [ -z "${CONFIG_IMAGE}" ]; then if [ -z "${CONFIG_IMAGE}" ]; then
CONFIG_DRIVE=$(mktemp -t -d flatcar-configdrive.XXXXXXXXXX) CONFIG_DRIVE=$(mktemp -t -d flatcar-configdrive.XXXXXXXXXX)
if [ $? -ne 0 ] || [ ! -d "$CONFIG_DRIVE" ]; then ret=$?
if [ "$ret" -ne 0 ] || [ ! -d "$CONFIG_DRIVE" ]; then
echo "$0: mktemp -d failed!" >&2 echo "$0: mktemp -d failed!" >&2
exit 1 exit 1
fi fi
# shellcheck disable=SC2064
trap "rm -rf '$CONFIG_DRIVE'" EXIT trap "rm -rf '$CONFIG_DRIVE'" EXIT
mkdir -p "${CONFIG_DRIVE}/openstack/latest" mkdir -p "${CONFIG_DRIVE}/openstack/latest"
@ -126,7 +128,8 @@ if [ -z "${CONFIG_IMAGE}" ]; then
exit 1 exit 1
fi fi
SSH_KEYS_TEXT=$(cat "$SSH_KEYS") SSH_KEYS_TEXT=$(cat "$SSH_KEYS")
if [ $? -ne 0 ] || [ -z "$SSH_KEYS_TEXT" ]; then ret=$?
if [ "$ret" -ne 0 ] || [ -z "$SSH_KEYS_TEXT" ]; then
echo "$0: Failed to read SSH keys from $SSH_KEYS" >&2 echo "$0: Failed to read SSH keys from $SSH_KEYS" >&2
exit 1 exit 1
fi fi
@ -134,7 +137,8 @@ if [ -z "${CONFIG_IMAGE}" ]; then
"${CONFIG_DRIVE}/openstack/latest/user_data" "${CONFIG_DRIVE}/openstack/latest/user_data"
elif [ -n "${CLOUD_CONFIG_FILE}" ]; then elif [ -n "${CLOUD_CONFIG_FILE}" ]; then
cp "${CLOUD_CONFIG_FILE}" "${CONFIG_DRIVE}/openstack/latest/user_data" cp "${CLOUD_CONFIG_FILE}" "${CONFIG_DRIVE}/openstack/latest/user_data"
if [ $? -ne 0 ]; then ret=$?
if [ "$ret" -ne 0 ]; then
echo "$0: Failed to copy cloudinit file from $CLOUD_CONFIG_FILE" >&2 echo "$0: Failed to copy cloudinit file from $CLOUD_CONFIG_FILE" >&2
exit 1 exit 1
fi fi