From 9ca157c14073f672effb6e13f9f2c0413fe42008 Mon Sep 17 00:00:00 2001
From: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
Date: Sat, 3 Dec 2011 18:08:57 -0300
Subject: [archiso] archiso_pxe_curl rename to archiso_pxe_http

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
---
 archiso/hooks/archiso_pxe_curl | 61 ------------------------------------------
 archiso/hooks/archiso_pxe_http | 61 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 61 deletions(-)
 delete mode 100644 archiso/hooks/archiso_pxe_curl
 create mode 100644 archiso/hooks/archiso_pxe_http

(limited to 'archiso/hooks')

diff --git a/archiso/hooks/archiso_pxe_curl b/archiso/hooks/archiso_pxe_curl
deleted file mode 100644
index 8f3711c..0000000
--- a/archiso/hooks/archiso_pxe_curl
+++ /dev/null
@@ -1,61 +0,0 @@
-# vim: set ft=sh:
-
-run_hook() {
-    if [[ -n "${ip}" && -n "${archiso_curl_url}" ]]; then
-
-        archiso_curl_url=$(eval echo ${archiso_curl_url})
-        [[ -z "${curlspace_size}" ]] && curlspace_size="75%"
-
-        mount_handler="archiso_pxe_curl_mount_handler"
-    fi
-}
-
-# Fetch a file with CURL
-#
-# $1 URL
-# $2 Destination directory inside curlspace/${archisobasedir}
-_curl_get() {
-    local _url="${1}"
-    local _dst="${2}"
-
-    msg ":: Downloading '${_url}'"
-    if ! curl -f -o "/run/archiso/curlspace/${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_curl_mount_handler () {
-    newroot="${1}"
-
-    msg ":: Mounting /run/archiso/curlspace (tmpfs) filesystem, size='${curlspace_size}'"
-    mkdir -p "/run/archiso/curlspace"
-    mount -t tmpfs -o size="${curlspace_size}",mode=0755 curlspace "/run/archiso/curlspace"
-
-    local _aitab_url="${archiso_curl_url}${aitab#/run/archiso/bootmnt/}"
-    local _aitab_file="/run/archiso/curlspace/${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_curl_url}${archisobasedir}/${aitab_arch}/${aitab_img}.fs.sfs" "/${aitab_arch}"
-        else
-            _curl_get "${archiso_curl_url}${archisobasedir}/${aitab_arch}/${aitab_img}.sfs" "/${aitab_arch}"
-        fi
-    done < "${_aitab_file}"
-
-    if [[ "${checksum}" == "y" ]]; then
-        _curl_get "${archiso_curl_url}${archisobasedir}/checksum.${arch}.md5" "/"
-    fi
-
-    mkdir -p "/run/archiso/bootmnt"
-    mount -o bind /run/archiso/curlspace /run/archiso/bootmnt
-
-    archiso_mount_handler ${newroot}
-}
diff --git a/archiso/hooks/archiso_pxe_http b/archiso/hooks/archiso_pxe_http
new file mode 100644
index 0000000..7149013
--- /dev/null
+++ b/archiso/hooks/archiso_pxe_http
@@ -0,0 +1,61 @@
+# vim: set ft=sh:
+
+run_hook() {
+    if [[ -n "${ip}" && -n "${archiso_curl_url}" ]]; then
+
+        archiso_curl_url=$(eval echo ${archiso_curl_url})
+        [[ -z "${curlspace_size}" ]] && curlspace_size="75%"
+
+        mount_handler="archiso_pxe_http_mount_handler"
+    fi
+}
+
+# Fetch a file with CURL
+#
+# $1 URL
+# $2 Destination directory inside curlspace/${archisobasedir}
+_curl_get() {
+    local _url="${1}"
+    local _dst="${2}"
+
+    msg ":: Downloading '${_url}'"
+    if ! curl -f -o "/run/archiso/curlspace/${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/curlspace (tmpfs) filesystem, size='${curlspace_size}'"
+    mkdir -p "/run/archiso/curlspace"
+    mount -t tmpfs -o size="${curlspace_size}",mode=0755 curlspace "/run/archiso/curlspace"
+
+    local _aitab_url="${archiso_curl_url}${aitab#/run/archiso/bootmnt/}"
+    local _aitab_file="/run/archiso/curlspace/${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_curl_url}${archisobasedir}/${aitab_arch}/${aitab_img}.fs.sfs" "/${aitab_arch}"
+        else
+            _curl_get "${archiso_curl_url}${archisobasedir}/${aitab_arch}/${aitab_img}.sfs" "/${aitab_arch}"
+        fi
+    done < "${_aitab_file}"
+
+    if [[ "${checksum}" == "y" ]]; then
+        _curl_get "${archiso_curl_url}${archisobasedir}/checksum.${arch}.md5" "/"
+    fi
+
+    mkdir -p "/run/archiso/bootmnt"
+    mount -o bind /run/archiso/curlspace /run/archiso/bootmnt
+
+    archiso_mount_handler ${newroot}
+}
-- 
cgit v1.2.3-54-g00ecf