r00t2/bdisk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

adding custom EMBED URI

Browse Source
This commit is contained in:
brent s. 2015-07-12 00:46:45 -04:00
parent b4d619f2f9
commit 67aba34ed1
3 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
TODO
View File

@ -34,8 +34,7 @@
--http://ipxe.org/crypto --http://ipxe.org/crypto
--http://ipxe.org/cmd/imgtrust --http://ipxe.org/cmd/imgtrust
--http://ipxe.org/cmd/imgverify --http://ipxe.org/cmd/imgverify
--https://aur.archlinux.org/packages/ip/ipxe-git/PKGBUILD (NOTE the patches- banner and efi iso specifically) --enable use of custom CA/self-signed certs for HTTPS etc.
--add conf option to specify EMBED uri
-X-platform -X-platform
--what distros are supported? --what distros are supported?
--automatically install what we need for buildtime --automatically install what we need for buildtime

25
extra/build.conf.sample
View File

@ -61,7 +61,17 @@ MULTIARCH="yes"
# set this to "yes". Otherwise, just build the full ISO. # set this to "yes". Otherwise, just build the full ISO.
BUILDMINI="no" BUILDMINI="no"
# set to "yes" to enable pushing new changes to a git repo/committing to a local repo # What URI should iPXE's EMBED script use?
# Only used if BUILDMINI is set to yes.
# DO NOT USE A ',' (comma); instead, replace it with:
# %%COMMA%%
# If you require HTTP BASIC Authentication or HTTP Digest Authentication (untested), you can
# format it via the following:
# https://user:password@domain.tld/page.php
# This currently does not work for HTTPS with self-signed certificates.
IPXE_URI="https://bdisk.square-r00t.net"
# Set to "yes" to enable pushing new changes to a git repo/committing to a local repo
GIT="no" GIT="no"
# If this is set, use rsync to copy the http and iso files. This is the rsync destination host. # If this is set, use rsync to copy the http and iso files. This is the rsync destination host.
@ -119,17 +129,14 @@ I_AM_A_RACECAR="no"
# ________________________________________________________________________________________________ # ________________________________________________________________________________________________
## RECOMMENDED DEFALTS ## ## RECOMMENDED DEFALTS ##
# The following shoult not be changed unless you are ABSOLUTELY, 100% SURE and COMPLETELY POSITIVE # The following should not be changed unless you are ABSOLUTELY, 100% SURE and COMPLETELY POSITIVE
# about what you are doing!!! # about what you are doing!!!
# Legacy support. # This used to be defined statically, but is now dynamically appended. Please don't alter this
BASEDIR="${BASEDIR}" # unless you renamed the chroot directory paths.
# This used to be defined statically (e.g. CHBASEDIR="${BASEDIR}/chroot"),
# but is now dynamically appended. Please don't alter this unless you renamed the chroot directory paths.
CHROOTDIR="${BASEDIR}/" CHROOTDIR="${BASEDIR}/"
CHROOTDIR32="${CHBASEDIR}root.i686" CHROOTDIR32="${CHROOTDIR}root.i686"
CHROOTDIR64="${CHBASEDIR}root.x86_64" CHROOTDIR64="${CHROOTDIR}root.x86_64"
# This is a directory we use for staging. It definitely should not be checked into git. # This is a directory we use for staging. It definitely should not be checked into git.
# It used to be defined statically (e.g. BUILDDIR="${BASEDIR}/build"), # It used to be defined statically (e.g. BUILDDIR="${BASEDIR}/build"),

9
lib/11-yo_dj.func.sh
View File

@ -293,9 +293,12 @@ EOF
do do
patch -Np2 < ${BASEDIR}/src/ipxe_local/patches/${i} >> "${LOGFILE}.${FUNCNAME}" 2>&1 patch -Np2 < ${BASEDIR}/src/ipxe_local/patches/${i} >> "${LOGFILE}.${FUNCNAME}" 2>&1
done done
#make everything EMBED="${BASEDIR}/src/ipxe_local/EMBED" >> "${LOGFILE}.${FUNCNAME}" 2>&1 # Generate the iPXE EMBED script...
make bin-i386-efi/ipxe.efi bin-x86_64-efi/ipxe.efi EMBED="${BASEDIR}/src/ipxe_local/EMBED" >> "${LOGFILE}.${FUNCNAME}" 2>&1 sed -re "s,^(chain\ ).*$,\1${IPXE_URI},g" \
make bin/ipxe.eiso bin/ipxe.usb EMBED="${BASEDIR}/src/ipxe_local/EMBED" >> "${LOGFILE}.${FUNCNAME}" 2>&1 -e 's/%%COMMA%%/,/g' ${BASEDIR}/src/ipxe_local/EMBED > ${SRCDIR}/EMBED
#make everything EMBED="${SRCDIR}/EMBED" >> "${LOGFILE}.${FUNCNAME}" 2>&1
make bin-i386-efi/ipxe.efi bin-x86_64-efi/ipxe.efi EMBED="${SRCDIR}/EMBED" >> "${LOGFILE}.${FUNCNAME}" 2>&1
make bin/ipxe.eiso bin/ipxe.usb EMBED="${SRCDIR}/EMBED" >> "${LOGFILE}.${FUNCNAME}" 2>&1
# Change this to USB-only... # Change this to USB-only...
#make all EMBED="${BASEDIR}/src/ipxe_local/EMBED" >> "${LOGFILE}.${FUNCNAME}" 2>&1 #make all EMBED="${BASEDIR}/src/ipxe_local/EMBED" >> "${LOGFILE}.${FUNCNAME}" 2>&1
mv -f ${BASEDIR}/src/ipxe/src/bin/ipxe.usb ${ISODIR}/${USBFILENAME} mv -f ${BASEDIR}/src/ipxe/src/bin/ipxe.usb ${ISODIR}/${USBFILENAME}