al/tiny-cloud
al/tiny-cloud
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/cloud/tiny-cloud.git synced 2025-12-16 11:52:43 +03:00
Code Packages Wiki

* post-shellcheck fixes

Browse Source
This commit is contained in:
Jake Buchholz Göktürk 2022-07-11 18:45:06 -07:00
parent e64f125aa9
commit ae8a36a60b
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/tiny-cloud/nocloud/imds
View File

@ -15,10 +15,10 @@ _load_nocloud_cmdline() {
v=$(echo "$kv" | cut -d= -f2- | sed -Ee s'|^file://|/|') v=$(echo "$kv" | cut -d= -f2- | sed -Ee s'|^file://|/|')
case "$k" in case "$k" in
h|hostname) h|hostname)
echo -e "\nhostname: $hostname" >> "$TINY_CLOUD_VAR/meta-data" echo -e "\nhostname: $v" >> "$TINY_CLOUD_VAR/meta-data"
;; ;;
i|instance-id) i|instance-id)
echo -e "\ninstance-id: $hostname" >> "$TINY_CLOUD_VAR/meta-data" echo -e "\ninstance-id: $v" >> "$TINY_CLOUD_VAR/meta-data"
;; ;;
s|seedfrom) s|seedfrom)
for data in $NOCLOUD_FILES; do for data in $NOCLOUD_FILES; do
@ -34,7 +34,6 @@ _load_nocloud_cmdline() {
*) echo "WARNING: Ignoring unknown seedfrom value '$v'" >&2 *) echo "WARNING: Ignoring unknown seedfrom value '$v'" >&2
;; ;;
esac esac
;;
done done
;; ;;
*) echo "WARNING: Ignoring unknown nocloud kernel cmdline key '$k'" >&2 *) echo "WARNING: Ignoring unknown nocloud kernel cmdline key '$k'" >&2
@ -77,7 +76,6 @@ load_nocloud() {
_imds() { _imds() {
local file="$TINY_CLOUD_VAR"/$(echo "$1" | cut -d/ -f1) local file="$TINY_CLOUD_VAR"/$(echo "$1" | cut -d/ -f1)
local key=$(echo "$1" | cut -d/ -f2-) local key=$(echo "$1" | cut -d/ -f2-)
local data value
is_nocloud_loaded || load_nocloud || return 1 is_nocloud_loaded || load_nocloud || return 1
@ -85,5 +83,9 @@ _imds() {
[ -f "$file" ] || return 1 [ -f "$file" ] || return 1
# use 'file/' to get top-level keys # use 'file/' to get top-level keys
[ "$1" = "$file" ] && cat "$file" || yx -f "$file" "$key" if [ "$1" = "$file" ]; then
cat "$file"
else
yx -f "$file" "$key"
fi
} }

2
lib/tiny-cloud/oci/imds
View File

@ -27,7 +27,7 @@ _imds_ssh_keys() { _imds "$IMDS_SSH_KEYS"; }
_imds_nic_index() { _imds_nic_index() {
local m n=0 local m n=0
local mac=$(cat /sys/class/net/$1/mac) local mac=$(cat "/sys/class/net/$1/mac")
while m=$(imds $IMDS_NICS/$n/mac | tr A-F a-f); do while m=$(imds $IMDS_NICS/$n/mac | tr A-F a-f); do
[ "$m" = "$mac" ] && echo $n; return 0 [ "$m" = "$mac" ] && echo $n; return 0
done done