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 03:42:44 +03:00
Code Packages Wiki

* fix nocloud volume datasource mountpoint

Browse Source 
* improve nocloud cmdline parsing
This commit is contained in:
Jake Buchholz Göktürk 2022-07-19 21:08:36 -07:00
parent 1db5102fad
commit ea706cd660
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,10 +9,10 @@ _load_nocloud_cmdline() {
local kopt kv k v data local kopt kv k v data
for kopt in $(cat /proc/cmdline); do for kopt in $(cat /proc/cmdline); do
echo "$kopt" | grep -qE '(^|=)ds=nocloud(-net)?(;|$)' || continue echo "$kopt" | grep -qE '(^|=)ds=nocloud(-net)?;' || continue
for kv in $(echo "$kopt" | sed -Ee 's/.*ds=nocloud(-net)?(;|$)//' | tr \; ' '); do for kv in $(echo "${kopt#*;}" | tr \; ' '); do
k=$(echo "$kv" | cut -d= -f1) k=$(echo "$kv" | cut -d= -f1)
v=$(echo "$kv" | cut -d= -f2- | sed -Ee s'|^file://|/|') v=$(echo "$kv" | cut -d= -f2-)
case "$k" in case "$k" in
h|hostname) h|hostname)
echo -e "\nhostname: $v" >> "$TINY_CLOUD_VAR/meta-data" echo -e "\nhostname: $v" >> "$TINY_CLOUD_VAR/meta-data"
@ -22,7 +22,7 @@ _load_nocloud_cmdline() {
;; ;;
s|seedfrom) s|seedfrom)
for data in $NOCLOUD_FILES; do for data in $NOCLOUD_FILES; do
case "$v" in case "${v#file:/}" in
/*) /*)
cat "$v/$data" >> "$TINY_CLOUD_VAR/$data" || continue cat "$v/$data" >> "$TINY_CLOUD_VAR/$data" || continue
echo >> "$TINY_CLOUD_VAR/$data" echo >> "$TINY_CLOUD_VAR/$data"
@ -46,7 +46,7 @@ _load_nocloud_cmdline() {
} }
_load_nocloud_volume() { _load_nocloud_volume() {
local mntdir=$(mktemp /mnt/cidata-XXXXXX) local mntdir=$(mktemp -d /mnt/cidata-XXXXXX)
local data mounted local data mounted
mkdir -p "$mntdir" mkdir -p "$mntdir"