fablab-nea/labsync
1
0
Fork 0
Code Issues 11 Pull requests 2 Projects Releases Packages Wiki Activity Actions

Revert "Replace aria2c with wget"

Browse source 
This reverts commit 208b96d8b6.
This commit is contained in:
jalr 2019-06-21 17:12:32 +02:00
parent 208b96d8b6
commit 29bb770672
2 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packer/initramfs/labsync
View file

@ -98,7 +98,7 @@ labsync_mount_root() {
vg_name="vglab"
if [ -z "$labsync_localboot" ]; then
labsync_info "Downloading torrent file from ${labsync_torrent}"
while ! wget -O /tmp/torrent "${labsync_torrent}"; do sleep 1; done
while ! aria2c -t 10 --follow-torrent=false --dir /tmp -o torrent "${labsync_torrent}"; do sleep 1; done
aria2c -S /tmp/torrent > /tmp/torrent_info
squashfs_file="$(sed -n '/idx|path\/length/,${s/\s*1|\(.*\)$/\1/p}' /tmp/torrent_info)"
image_size_bytes="$(sed -n 's/Total Length: .*(\([0-9,]*\)).*$/\1/p' /tmp/torrent_info | tr -d ',')"

2
packer/initramfs/labsync-prereqs
View file

@ -7,8 +7,6 @@ case $1 in
##
. /usr/share/initramfs-tools/hook-functions
rm -f "$DESTDIR/sbin/mke2fs"
mkdir -p "$DESTDIR/lib/x86_64-linux-gnu"
cp /lib/x86_64-linux-gnu/libnss_dns* "$DESTDIR/lib/x86_64-linux-gnu"
copy_exec /sbin/e2fsck
copy_exec /sbin/mke2fs
copy_exec /sbin/sfdisk