f5b84dad94
Currently, when booting via HTTP, the airootfs.md5 file is downloaded to
/run/archiso/bootmnt/arch/. However, the checksum file is later assumed
to be located at "/run/archiso/bootmnt/arch/${arch}". Fix the _curl_get
invocation and directly place the file in the right directory.
Fixes a regression introduced in commit b3e1d31 ([archiso] Rework
checksum function, 2014-06-28).
Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
48 lines
1.4 KiB
Bash
48 lines
1.4 KiB
Bash
# vim: set ft=sh:
|
|
|
|
run_hook() {
|
|
if [[ -n "${ip}" && -n "${archiso_http_srv}" ]]; then
|
|
|
|
archiso_http_srv=$(eval echo ${archiso_http_srv})
|
|
[[ -z "${archiso_http_spc}" ]] && archiso_http_spc="75%"
|
|
|
|
mount_handler="archiso_pxe_http_mount_handler"
|
|
fi
|
|
}
|
|
|
|
# Fetch a file with CURL
|
|
#
|
|
# $1 URL
|
|
# $2 Destination directory inside httpspace/${archisobasedir}
|
|
_curl_get() {
|
|
local _url="${1}"
|
|
local _dst="${2}"
|
|
|
|
msg ":: Downloading '${_url}'"
|
|
if ! curl -L -f -o "/run/archiso/httpspace/${archisobasedir}${_dst}/${_url##*/}" --create-dirs "${_url}"; then
|
|
echo "ERROR: Downloading '${_url}'"
|
|
echo " Falling back to interactive prompt"
|
|
echo " You can try to fix the problem manually, log out when you are finished"
|
|
launch_interactive_shell
|
|
fi
|
|
}
|
|
|
|
archiso_pxe_http_mount_handler () {
|
|
newroot="${1}"
|
|
|
|
msg ":: Mounting /run/archiso/httpspace (tmpfs) filesystem, size='${archiso_http_spc}'"
|
|
mkdir -p "/run/archiso/httpspace"
|
|
mount -t tmpfs -o size="${archiso_http_spc}",mode=0755 httpspace "/run/archiso/httpspace"
|
|
|
|
_curl_get "${archiso_http_srv}${archisobasedir}/${arch}/airootfs.sfs" "/${arch}"
|
|
|
|
if [[ "${checksum}" == "y" ]]; then
|
|
_curl_get "${archiso_http_srv}${archisobasedir}/${arch}/airootfs.md5" "/${arch}"
|
|
fi
|
|
|
|
mkdir -p "/run/archiso/bootmnt"
|
|
mount -o bind /run/archiso/httpspace /run/archiso/bootmnt
|
|
|
|
archiso_mount_handler ${newroot}
|
|
}
|