buildipxe.sh (fogproject-1.5.8) | : | buildipxe.sh (fogproject-1.5.9) | ||
---|---|---|---|---|
skipping to change at line 20 | skipping to change at line 20 | |||
SCRIPT=$(readlink -f "$BASH_SOURCE") | SCRIPT=$(readlink -f "$BASH_SOURCE") | |||
FOGDIR=$(dirname $(dirname $(dirname "$SCRIPT") ) ) | FOGDIR=$(dirname $(dirname $(dirname "$SCRIPT") ) ) | |||
BASE=$(dirname "$FOGDIR") | BASE=$(dirname "$FOGDIR") | |||
if [[ -d ${BASE}/ipxe ]]; then | if [[ -d ${BASE}/ipxe ]]; then | |||
cd ${BASE}/ipxe | cd ${BASE}/ipxe | |||
git clean -fd | git clean -fd | |||
git reset --hard | git reset --hard | |||
git pull | git pull | |||
cd src/ | cd src/ | |||
# make sure this is being re-compiled in case the CA has changed! | ||||
touch crypto/rootcert.c | ||||
else | else | |||
git clone ${IPXEGIT} ${BASE}/ipxe | git clone ${IPXEGIT} ${BASE}/ipxe | |||
cd ${BASE}/ipxe/src/ | cd ${BASE}/ipxe/src/ | |||
fi | fi | |||
# Get current header and script from fogproject repo | # Get current header and script from fogproject repo | |||
echo "Copy (overwrite) iPXE headers and scripts..." | echo "Copy (overwrite) iPXE headers and scripts..." | |||
cp ${FOGDIR}/src/ipxe/src/ipxescript . | cp ${FOGDIR}/src/ipxe/src/ipxescript . | |||
cp ${FOGDIR}/src/ipxe/src/ipxescript10sec . | cp ${FOGDIR}/src/ipxe/src/ipxescript10sec . | |||
cp ${FOGDIR}/src/ipxe/src/config/general.h config/ | cp ${FOGDIR}/src/ipxe/src/config/general.h config/ | |||
skipping to change at line 54 | skipping to change at line 56 | |||
cp bin/ipxe.iso bin/{undionly,ipxe,intel,realtek}.{,k,kk}pxe bin/ipxe.lkrn bin/i pxe.usb ${FOGDIR}/packages/tftp/10secdelay/ | cp bin/ipxe.iso bin/{undionly,ipxe,intel,realtek}.{,k,kk}pxe bin/ipxe.lkrn bin/i pxe.usb ${FOGDIR}/packages/tftp/10secdelay/ | |||
cp bin/ipxe.lkrn ${FOGDIR}/packages/tftp/10secdelay/ipxe.krn | cp bin/ipxe.lkrn ${FOGDIR}/packages/tftp/10secdelay/ipxe.krn | |||
# Change to the efi layout | # Change to the efi layout | |||
if [[ -d ${BASE}/ipxe-efi ]]; then | if [[ -d ${BASE}/ipxe-efi ]]; then | |||
cd ${BASE}/ipxe-efi/ | cd ${BASE}/ipxe-efi/ | |||
git clean -fd | git clean -fd | |||
git reset --hard | git reset --hard | |||
git pull | git pull | |||
cd src/ | cd src/ | |||
# make sure this is being re-compiled in case the CA has changed! | ||||
touch crypto/rootcert.c | ||||
else | else | |||
git clone ${IPXEGIT} ${BASE}/ipxe-efi | git clone ${IPXEGIT} ${BASE}/ipxe-efi | |||
cd ${BASE}/ipxe-efi/src/ | cd ${BASE}/ipxe-efi/src/ | |||
fi | fi | |||
# Get current header and script from fogproject repo | # Get current header and script from fogproject repo | |||
echo "Copy (overwrite) iPXE headers and scripts..." | echo "Copy (overwrite) iPXE headers and scripts..." | |||
cp ${FOGDIR}/src/ipxe/src-efi/ipxescript . | cp ${FOGDIR}/src/ipxe/src-efi/ipxescript . | |||
cp ${FOGDIR}/src/ipxe/src-efi/ipxescript10sec . | cp ${FOGDIR}/src/ipxe/src-efi/ipxescript10sec . | |||
cp ${FOGDIR}/src/ipxe/src-efi/config/general.h config/ | cp ${FOGDIR}/src/ipxe/src-efi/config/general.h config/ | |||
End of changes. 2 change blocks. | ||||
0 lines changed or deleted | 4 lines changed or added |