faerbit/archiso
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[archiso] archiso_pxe_curl rename to archiso_pxe_http

Browse Source 
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
This commit is contained in:
Gerardo Exequiel Pozzi 2011-12-03 18:08:57 -03:00
parent 92dbba6c11
commit 9ca157c140
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README
View File

@ -5,7 +5,7 @@ INDEX
* hooks/archiso * hooks/archiso
* hooks/archiso_pxe_common * hooks/archiso_pxe_common
* hooks/archiso_pxe_nbd * hooks/archiso_pxe_nbd
* hooks/archiso_pxe_curl * hooks/archiso_pxe_http
* hooks/archiso_pxe_nfs * hooks/archiso_pxe_nfs
* hooks/archiso_loop_mnt * hooks/archiso_loop_mnt
* Boot parameters (only for configs/releng) * Boot parameters (only for configs/releng)
@ -87,7 +87,7 @@ INDEX
Default: (unset) Default: (unset)
** hooks/archiso_pxe_curl ** hooks/archiso_pxe_http
* archiso_curl_url= Set an HTTP/FTP URL (must end with /) where ${archisobasedir} * archiso_curl_url= Set an HTTP/FTP URL (must end with /) where ${archisobasedir}
is found with all *.sfs files. is found with all *.sfs files.
@ -163,7 +163,7 @@ if nothing is specified on command line.
+ mkinitcpio-nfs-utils for ipconfig + mkinitcpio-nfs-utils for ipconfig
* archiso_pxe_nbd * archiso_pxe_nbd
+ nbd for nbd-client + nbd for nbd-client
* archiso_pxe_curl * archiso_pxe_http
+ curl for curl + curl for curl
* archiso_pxe_nfs * archiso_pxe_nfs
+ mkinitcpio-nfs-utils for nfsmount + mkinitcpio-nfs-utils for nfsmount

8
archiso/Makefile
View File

@ -20,8 +20,8 @@ install-hooks:
install -D -m 644 install/archiso_pxe_common $(DESTDIR)/lib/initcpio/install/archiso_pxe_common install -D -m 644 install/archiso_pxe_common $(DESTDIR)/lib/initcpio/install/archiso_pxe_common
install -D -m 644 hooks/archiso_pxe_nbd $(DESTDIR)/lib/initcpio/hooks/archiso_pxe_nbd install -D -m 644 hooks/archiso_pxe_nbd $(DESTDIR)/lib/initcpio/hooks/archiso_pxe_nbd
install -D -m 644 install/archiso_pxe_nbd $(DESTDIR)/lib/initcpio/install/archiso_pxe_nbd install -D -m 644 install/archiso_pxe_nbd $(DESTDIR)/lib/initcpio/install/archiso_pxe_nbd
install -D -m 644 hooks/archiso_pxe_curl $(DESTDIR)/lib/initcpio/hooks/archiso_pxe_curl install -D -m 644 hooks/archiso_pxe_http $(DESTDIR)/lib/initcpio/hooks/archiso_pxe_http
install -D -m 644 install/archiso_pxe_curl $(DESTDIR)/lib/initcpio/install/archiso_pxe_curl install -D -m 644 install/archiso_pxe_http $(DESTDIR)/lib/initcpio/install/archiso_pxe_http
install -D -m 644 hooks/archiso_pxe_nfs $(DESTDIR)/lib/initcpio/hooks/archiso_pxe_nfs install -D -m 644 hooks/archiso_pxe_nfs $(DESTDIR)/lib/initcpio/hooks/archiso_pxe_nfs
install -D -m 644 install/archiso_pxe_nfs $(DESTDIR)/lib/initcpio/install/archiso_pxe_nfs install -D -m 644 install/archiso_pxe_nfs $(DESTDIR)/lib/initcpio/install/archiso_pxe_nfs
install -D -m 644 hooks/archiso_loop_mnt $(DESTDIR)/lib/initcpio/hooks/archiso_loop_mnt install -D -m 644 hooks/archiso_loop_mnt $(DESTDIR)/lib/initcpio/hooks/archiso_loop_mnt
@ -50,8 +50,8 @@ uninstall:
rm -f $(DESTDIR)/lib/initcpio/install/archiso_pxe_common rm -f $(DESTDIR)/lib/initcpio/install/archiso_pxe_common
rm -f $(DESTDIR)/lib/initcpio/hooks/archiso_pxe_nbd rm -f $(DESTDIR)/lib/initcpio/hooks/archiso_pxe_nbd
rm -f $(DESTDIR)/lib/initcpio/install/archiso_pxe_nbd rm -f $(DESTDIR)/lib/initcpio/install/archiso_pxe_nbd
rm -f $(DESTDIR)/lib/initcpio/hooks/archiso_pxe_curl rm -f $(DESTDIR)/lib/initcpio/hooks/archiso_pxe_http
rm -f $(DESTDIR)/lib/initcpio/install/archiso_pxe_curl rm -f $(DESTDIR)/lib/initcpio/install/archiso_pxe_http
rm -f $(DESTDIR)/lib/initcpio/hooks/archiso_pxe_nfs rm -f $(DESTDIR)/lib/initcpio/hooks/archiso_pxe_nfs
rm -f $(DESTDIR)/lib/initcpio/install/archiso_pxe_nfs rm -f $(DESTDIR)/lib/initcpio/install/archiso_pxe_nfs
rm -f $(DESTDIR)/lib/initcpio/hooks/archiso_loop_mnt rm -f $(DESTDIR)/lib/initcpio/hooks/archiso_loop_mnt

4
archiso/hooks/archiso_pxe_curl → archiso/hooks/archiso_pxe_http
View File

@ -6,7 +6,7 @@ run_hook() {
archiso_curl_url=$(eval echo ${archiso_curl_url}) archiso_curl_url=$(eval echo ${archiso_curl_url})
[[ -z "${curlspace_size}" ]] && curlspace_size="75%" [[ -z "${curlspace_size}" ]] && curlspace_size="75%"
mount_handler="archiso_pxe_curl_mount_handler" mount_handler="archiso_pxe_http_mount_handler"
fi fi
} }
@ -27,7 +27,7 @@ _curl_get() {
fi fi
} }
archiso_pxe_curl_mount_handler () { archiso_pxe_http_mount_handler () {
newroot="${1}" newroot="${1}"
msg ":: Mounting /run/archiso/curlspace (tmpfs) filesystem, size='${curlspace_size}'" msg ":: Mounting /run/archiso/curlspace (tmpfs) filesystem, size='${curlspace_size}'"

2
archiso/install/archiso_pxe_curl → archiso/install/archiso_pxe_http
View File

@ -5,7 +5,7 @@ build ()
MODULES="" MODULES=""
BINARIES="" BINARIES=""
FILES="" FILES=""
SCRIPT="archiso_pxe_curl" SCRIPT="archiso_pxe_http"
add_binary "/usr/bin/curl" add_binary "/usr/bin/curl"
} }

2
configs/releng/build.sh
View File

@ -28,7 +28,7 @@ make_packages() {
make_setup_mkinitcpio() { make_setup_mkinitcpio() {
if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then
local _hook local _hook
for _hook in archiso archiso_shutdown archiso_pxe_common archiso_pxe_nbd archiso_pxe_curl archiso_pxe_nfs archiso_loop_mnt; do for _hook in archiso archiso_shutdown archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_loop_mnt; do
cp /lib/initcpio/hooks/${_hook} ${work_dir}/root-image/lib/initcpio/hooks cp /lib/initcpio/hooks/${_hook} ${work_dir}/root-image/lib/initcpio/hooks
cp /lib/initcpio/install/${_hook} ${work_dir}/root-image/lib/initcpio/install cp /lib/initcpio/install/${_hook} ${work_dir}/root-image/lib/initcpio/install
done done

2
configs/releng/mkinitcpio.conf
View File

@ -1,2 +1,2 @@
HOOKS="base udev memdisk archiso_shutdown archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_curl archiso_pxe_nfs archiso_kms pata scsi sata virtio usb fw pcmcia filesystems usbinput" HOOKS="base udev memdisk archiso_shutdown archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms pata scsi sata virtio usb fw pcmcia filesystems usbinput"
COMPRESSION="xz" COMPRESSION="xz"