adding patches
This commit is contained in:
parent
801c5950e6
commit
114fbed031
@ -50,7 +50,7 @@ FILES=""
|
|||||||
# usr, fsck and shutdown hooks.
|
# usr, fsck and shutdown hooks.
|
||||||
#HOOKS="base udev autodetect modconf block filesystems keyboard fsck"
|
#HOOKS="base udev autodetect modconf block filesystems keyboard fsck"
|
||||||
#HOOKS="base udev memdisk archiso_shutdown archiso modconf net ssh archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block pcmcia filesystems keyboard livecd"
|
#HOOKS="base udev memdisk archiso_shutdown archiso modconf net ssh archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block pcmcia filesystems keyboard livecd"
|
||||||
HOOKS="base udev memdisk archiso_shutdown archiso-custom modconf net ssh archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block pcmcia filesystems keyboard livecd"
|
HOOKS="base udev memdisk archiso_shutdown archiso-custom modconf net ssh archiso_loop_mnt archiso_http_custom archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block pcmcia filesystems keyboard livecd"
|
||||||
|
|
||||||
# COMPRESSION
|
# COMPRESSION
|
||||||
# Use this to compress the initramfs image. By default, gzip compression
|
# Use this to compress the initramfs image. By default, gzip compression
|
||||||
|
47
extra/pre-build.d/usr/lib/initcpio/hooks/archiso_http_custom
Normal file
47
extra/pre-build.d/usr/lib/initcpio/hooks/archiso_http_custom
Normal file
@ -0,0 +1,47 @@
|
|||||||
|
# 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 -fs -o "/run/archiso/httpspace/${archisobasedir}${_dst}/${_url##*/}" --create-dirs "${_url}"; then
|
||||||
|
echo "ERROR: Downloading failed."
|
||||||
|
#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}
|
||||||
|
}
|
@ -0,0 +1,15 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
build() {
|
||||||
|
add_runscript
|
||||||
|
|
||||||
|
add_binary curl
|
||||||
|
}
|
||||||
|
|
||||||
|
help() {
|
||||||
|
cat<<HELPEOF
|
||||||
|
This hook loads the necessary modules for boot via PXE and HTTP.
|
||||||
|
HELPEOF
|
||||||
|
}
|
||||||
|
|
||||||
|
# vim: set ft=sh ts=4 sw=4 et:
|
@ -274,6 +274,9 @@ EOF
|
|||||||
-isohybrid-gpt-basdat \
|
-isohybrid-gpt-basdat \
|
||||||
-output "${ISODIR}/${ISOFILENAME}" "${TEMPDIR}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
|
-output "${ISODIR}/${ISOFILENAME}" "${TEMPDIR}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
|
||||||
|
|
||||||
|
## Build the mini-ISO ##
|
||||||
|
cd ${BASEDIR}/src/ipxe/src
|
||||||
|
for i in $(find ${BASEDIR}/
|
||||||
|
|
||||||
#isohybrid ${ISOFILENAME}
|
#isohybrid ${ISOFILENAME}
|
||||||
cd ${ISODIR}
|
cd ${ISODIR}
|
||||||
|
@ -26,15 +26,13 @@ index 4bcb64d..74b5b77 100644
|
|||||||
*/
|
*/
|
||||||
- printf ( NORMAL "\n\n" PRODUCT_NAME "\n" BOLD PRODUCT_SHORT_NAME " %s"
|
- printf ( NORMAL "\n\n" PRODUCT_NAME "\n" BOLD PRODUCT_SHORT_NAME " %s"
|
||||||
+ printf ( NORMAL "\n\n" PRODUCT_NAME "\n" BOLD PRODUCT_SHORT_NAME
|
+ printf ( NORMAL "\n\n" PRODUCT_NAME "\n" BOLD PRODUCT_SHORT_NAME
|
||||||
NORMAL " -- " PRODUCT_TAG_LINE " -- "
|
- NORMAL " -- " PRODUCT_TAG_LINE " -- "
|
||||||
- CYAN PRODUCT_URI NORMAL "\nFeatures:", product_version );
|
- CYAN PRODUCT_URI NORMAL "\nFeatures:", product_version );
|
||||||
+ CYAN PRODUCT_URI NORMAL "\n"
|
+ CYAN PRODUCT_URI NORMAL "\n"
|
||||||
+ BOLD "Arch" BLUE "Linux" NORMAL " -- make it simple and lightweight -- "
|
+ BOLD BLUE "http://bdisk.square-r00t.net/" NORMAL "\n"
|
||||||
+ BOLD BLUE "http://archlinux.org" NORMAL "\n"
|
+ "%s"
|
||||||
+ "Version %s compiled on " __DATE__ ", " __TIME__ "\n"
|
- for_each_table_entry ( feature, FEATURES )
|
||||||
+ "Features:", product_version );
|
- printf ( " %s", feature->name );
|
||||||
for_each_table_entry ( feature, FEATURES )
|
|
||||||
printf ( " %s", feature->name );
|
|
||||||
printf ( "\n" );
|
printf ( "\n" );
|
||||||
--
|
--
|
||||||
2.3.0
|
2.3.0
|
||||||
|
Loading…
Reference in New Issue
Block a user