From 8c44a222fa62a0bfa7b38f350b68219940699991 Mon Sep 17 00:00:00 2001 From: r00t Date: Mon, 29 Jun 2015 04:34:09 -0400 Subject: [PATCH] adding embeds --- README | 3 +++ lib/09-yo_dj.func.sh | 13 +++++++++---- src/ipxe_local/EMBED | 4 ++++ src/{ => ipxe_local}/ipxe-efi | 0 4 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 src/ipxe_local/EMBED rename src/{ => ipxe_local}/ipxe-efi (100%) diff --git a/README b/README index 2f3cf25..b755db6 100644 --- a/README +++ b/README @@ -162,3 +162,6 @@ $ git submodule init $ git submodule update to make sure you pull the submodules into your working tree. +You'll then want to cd src/ipxe/src and do: + + $ make everything EMBED=../../ipxe_local/EMBED diff --git a/lib/09-yo_dj.func.sh b/lib/09-yo_dj.func.sh index 0bfdaa4..2329ad0 100644 --- a/lib/09-yo_dj.func.sh +++ b/lib/09-yo_dj.func.sh @@ -287,10 +287,15 @@ EOF # are we rsyncing? if [ -n "${RSYNC_HOST}" ]; then - rsync -a ${TFTPDIR}/. ${RSYNC_HOST}:${RSYNC_DEST}/tftpboot/. - rsync -a ${HTTPDIR}/. ${RSYNC_HOST}:${RSYNC_DEST}/http/. + echo "Now sending to ${RSYNC_HOST} via rsync. This may take a while..." + echo "Sending TFTP files..." + rsync -a --info=progress2 ${TFTPDIR} ${RSYNC_HOST}:${RSYNC_DEST}/. + echo "Sending HTTP files..." + rsync -a --info=progress2 ${HTTPDIR} ${RSYNC_HOST}:${RSYNC_DEST}/. # rsync -a ${TEMPDIR}/boot/${UXNAME}.* ${RSYNC_HOST}:${RSYNC_DEST}/http/. - rsync -a ${ISODIR}/. ${RSYNC_HOST}:${RSYNC_DEST}/iso/. - rsync -a ${ROOTDIR}/extra/. ${RSYNC_HOST}:${RSYNC_DEST}/extra/. + echo "Sending the ISO files..." + rsync -a --info=progress2 ${ISODIR} ${RSYNC_HOST}:${RSYNC_DEST}/. + echo "Sending extra files..." + rsync -a --info=progress2 ${ROOTDIR}/extra ${RSYNC_HOST}:${RSYNC_DEST}/. fi } diff --git a/src/ipxe_local/EMBED b/src/ipxe_local/EMBED new file mode 100644 index 0000000..6a901e7 --- /dev/null +++ b/src/ipxe_local/EMBED @@ -0,0 +1,4 @@ +#!ipxe + +dhcp +chain http://bdisk.square-r00t.net diff --git a/src/ipxe-efi b/src/ipxe_local/ipxe-efi similarity index 100% rename from src/ipxe-efi rename to src/ipxe_local/ipxe-efi