Briq
/
linux-live
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

decrease tftp-based PXE boot time to ~ 1/3rd (#72) 

* decrease tftp-based PXE boot time to ~ 1/3rd

* decrease code amount by reusing tftp_mget function

* report parallel tftp download progress

even when seemingly out-of-order
pull/75/head
samunders-core 2019-06-26 07:33:07 +02:00 committed by Tomas-M
parent 0548b30e81
commit 5e288baafe
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
livekitlib
View File

@ -446,13 +446,26 @@ mount_data_http()
} }
# stdin = files to get
# $1 = server
# $2 = destination directory
#
tftp_mget()
{
while read FNAME; do
echo "* $FNAME ..." >&2
tftp -b 1486 -g -r "$FNAME" -l "$2/$FNAME" "$1"
done
}
# Download data from tftp # Download data from tftp
# $1 = target (store downloaded files there) # $1 = target (store downloaded files there)
# #
download_data_pxe() download_data_pxe()
{ {
debug_log "download_data_pxe" "$*" debug_log "download_data_pxe" "$*"
local IP CMD CLIENT SERVER GW MASK PORT PROTOCOL local IP CMD CLIENT SERVER GW MASK PORT PROTOCOL JOBS
mkdir -p "$1/$LIVEKITNAME" mkdir -p "$1/$LIVEKITNAME"
IP="$(cmdline_value ip)" IP="$(cmdline_value ip)"
@ -472,19 +485,22 @@ download_data_pxe()
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "Error downloading from http://$SERVER:$PORT, trying TFTP" >&2 echo "Error downloading from http://$SERVER:$PORT, trying TFTP" >&2
PROTOCOL=tftp PROTOCOL=tftp
tftp -g -r PXEFILELIST -l "$1/PXEFILELIST" $SERVER echo PXEFILELIST | tftp_mget "$SERVER" "$1"
fi fi
echo "* Downloading files from the list" >&2 echo "* Downloading files from the list" >&2
cat "$1/PXEFILELIST" | while read FILE; do
if [ "$PROTOCOL" = "http" ]; then if [ "$PROTOCOL" = "http" ]; then
cat "$1/PXEFILELIST" | while read FILE; do
wget -O "$1/$LIVEKITNAME/$FILE" "http://$SERVER:$PORT/$FILE" wget -O "$1/$LIVEKITNAME/$FILE" "http://$SERVER:$PORT/$FILE"
else
echo "* $FILE ..." >&2
tftp -g -r $FILE -l "$1/$LIVEKITNAME/$FILE" $SERVER
fi
done done
else
JOBS=3
for i in `seq 0 $((JOBS-1))`; do
awk "NR % $JOBS == $i {print}" < "$1/PXEFILELIST" | tftp_mget "$SERVER" "$1/$LIVEKITNAME" &
done
wait
fi
done done
echo "$1/$LIVEKITNAME" echo "$1/$LIVEKITNAME"