Merge branch 'master' of gparabola:archiso

Conflicts:
	README
	archiso/Makefile
	archiso/hooks/archiso
	archiso/hooks/archiso_loop_mnt
	archiso/hooks/archiso_pxe_nbd
	archiso/install/archiso
	archiso/install/archiso_loop_mnt
	archiso/install/archiso_pxe_nbd
	archiso/mkarchiso
	archiso/testiso
	configs/baseline/build.sh
	configs/releng/build.sh
	configs/releng/packages.i686
	configs/releng/packages.x86_64
	configs/releng/root-image/etc/hosts
	configs/releng/root-image/etc/issue
	configs/releng/root-image/etc/rc.conf
	configs/releng/syslinux.dual/archiso_pxe32.cfg
	configs/releng/syslinux.dual/archiso_pxe64.cfg
	configs/releng/syslinux/archiso_head.cfg
	configs/releng/syslinux/archiso_pxe.cfg
	configs/releng/syslinux/archiso_sys.cfg

1 files changed, 61 insertions, 0 deletions

diff --git a/archiso/hooks/archiso_pxe_http b/archiso/hooks/archiso_pxe_http
new file mode 100644
index 0000000..ae56210
--- /dev/null
+++ b/archiso/hooks/archiso_pxe_http
@@ -0,0 +1,61 @@
+# 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 -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"
+
+    local _aitab_url="${archiso_http_srv}${aitab#/run/archiso/bootmnt/}"
+    local _aitab_file="/run/archiso/httpspace/${aitab#/run/archiso/bootmnt/}"
+
+    _curl_get "${_aitab_url}" "/"
+
+    local aitab_img aitab_mnt aitab_arch aitab_sfs_comp aitab_fs_type aitab_fs_size
+    while read aitab_img aitab_mnt aitab_arch aitab_sfs_comp aitab_fs_type aitab_fs_size; do
+        [[ "${aitab_img#\#}" != "${aitab_img}" ]] && continue
+        [[ "${aitab_arch}" != "any" && "${aitab_arch}" != "${arch}" ]] && continue
+        if [[ "${aitab_fs_type}" != "none" ]]; then
+            _curl_get "${archiso_http_srv}${archisobasedir}/${aitab_arch}/${aitab_img}.fs.sfs" "/${aitab_arch}"
+        else
+            _curl_get "${archiso_http_srv}${archisobasedir}/${aitab_arch}/${aitab_img}.sfs" "/${aitab_arch}"
+        fi
+    done < "${_aitab_file}"
+
+    if [[ "${checksum}" == "y" ]]; then
+        _curl_get "${archiso_http_srv}${archisobasedir}/checksum.${arch}.md5" "/"
+    fi
+
+    mkdir -p "/run/archiso/bootmnt"
+    mount -o bind /run/archiso/httpspace /run/archiso/bootmnt
+
+    archiso_mount_handler ${newroot}
+}