v3.0.5

Author: brod-intel

CHANGELOG.md

@@ -220,6 +220,19 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Known Problem
 - Missing instructions of how to build the boot.wim, boot.sdi and BCD from Microsoft ADK
 
+## [3.0.5] - 2023-03-14
+### Added
+- Added support for UEFI HTTP Boot (HTTPClient)
+
+### Changed
+- Fixed anticipate DHCP delays in the network with iPXE
+- Fixed samba config path
+- Fixed detecting if there is more than one dhcp server on the network
+- Switched Docker Daemon to vfs because aufs bug on ESP uOS
+
+### Known Problem
+- Missing instructions of how to build the boot.wim, boot.sdi and BCD from Microsoft ADK
+
 
 [1.5.1]: https://github.com/intel/Edge-Software-Provisioner/compare/v1.5...v1.5.1
 [1.6.0]: https://github.com/intel/Edge-Software-Provisioner/compare/v1.5.1...v1.6
@@ -238,3 +251,4 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 [3.0.0]: https://github.com/intel/Edge-Software-Provisioner/compare/v2.5.4...v3.0
 [3.0.1]: https://github.com/intel/Edge-Software-Provisioner/compare/v3.0...v3.0.1
 [3.0.2]: https://github.com/intel/Edge-Software-Provisioner/compare/v3.0.1...v3.0.2
+[3.0.3]: https://github.com/intel/Edge-Software-Provisioner/compare/v3.0.2...v3.0.3

docker-compose.yml

@@ -261,6 +261,7 @@ services:
       - 445:445
     volumes:
       - ./data/usr/share/nginx/html/smb:/smbshare
+      - ./template/smb/smb.conf:/etc/samba/smb.conf
     tty: true
     # network_mode: bridge
     depends_on: 

dockerfiles/dnsmasq/Dockerfile

@@ -43,6 +43,7 @@ RUN sed -i 's|//#define\tCONSOLE_FRAMEBUFFER|#define\tCONSOLE_FRAMEBUFFER|g' /bu
 # Destination folder for compiled files
 WORKDIR /ipxe/
 
+# The following is too anticipate DHCP delays in the network
 RUN echo -e '#!ipxe\n\ndhcp\nchain menu.ipxe' > /build/src/chain.ipxe
 
 # Compile embedded chain.ipxe for USB/ISO boot
@@ -54,12 +55,15 @@ RUN make -C /build/src/ bin/ipxe.lkrn EMBED=chain.ipxe -j8 && \
     cp /build/src/bin-x86_64-efi/ipxe.efi /ipxe/bin-x86_64-efi/ipxe.efi.chain && \
     make -C /build/src/ clean
 
+# The following is too anticipate DHCP delays in the network
+RUN echo -e '#!ipxe\n\ndhcp\nchain ${filename}' > /build/src/chain.ipxe
+
 # Compile the files in "bin/"
 ARG IPXE_BIN="bin/ipxe.dsk bin/ipxe.lkrn bin/ipxe.iso bin/ipxe.usb bin/ipxe.pxe bin/undionly.kpxe bin/rtl8139.rom bin/8086100e.mrom bin/80861209.rom bin/10500940.rom bin/10ec8139.rom bin/1af41000.rom bin/8086100f.mrom bin/808610d3.mrom bin/10222000.rom bin/15ad07b0.rom bin/3c509.rom bin/intel.rom bin/intel.mrom"
 # _bin="bin/${IPXE_BIN// / bin\/}" \
 RUN [ -z "${IPXE_BIN}" ] || ( \
     _bin="${IPXE_BIN}" \
-    && make -C /build/src/ ${_bin} -j8 \
+    && make -C /build/src/ ${_bin} EMBED=chain.ipxe -j8 \
     && mkdir -p bin/ \
     && for file in ${_bin} ;do ln -v /build/src/${file} /ipxe/${file} ;done \
     )
@@ -69,7 +73,7 @@ ARG IPXE_EFI="bin-i386-efi/ipxe.efi bin-i386-efi/ipxe.usb bin-i386-efi/ipxe.efid
 # _efi="bin-i386-efi/${IPXE_EFI// / bin-i386-efi\/}" \
 RUN [ -z "${IPXE_EFI}" ] || ( \
     _efi="${IPXE_EFI}" \
-    && make -C /build/src/ ${_efi} -j8 \
+    && make -C /build/src/ ${_efi} EMBED=chain.ipxe -j8 \
     && mkdir -p bin-i386-efi/ \
     && for file in ${_efi} ;do ln -v /build/src/${file} /ipxe/${file} ;done \
     )
@@ -79,7 +83,7 @@ ARG IPXE_EFI64="bin-x86_64-efi/ipxe.efi bin-x86_64-efi/ipxe.usb bin-x86_64-efi/i
 # _efi64="bin-x86_64-efi/${IPXE_EFI64// / bin-x86_64-efi\/}" \
 RUN [ -z "${IPXE_EFI64}" ] || ( \
     _efi64="${IPXE_EFI64}" \
-    && make -C /build/src/ ${_efi64} -j8 \
+    && make -C /build/src/ ${_efi64} EMBED=chain.ipxe -j8 \
     && mkdir -p bin-x86_64-efi/ \
     && for file in ${_efi64} ;do ln -v /build/src/${file} /ipxe/${file} ;done \
     )
@@ -92,7 +96,7 @@ ARG IPXE_PCBIOS64="bin-x86_64-pcbios/8086100e.mrom bin-x86_64-pcbios/intel.rom b
 # _bin64="bin-x86_64-pcbios/${IPXE_PCBIOS64// / bin-x86_64-pcbios\/}" \
 RUN [ -z "${IPXE_PCBIOS64}" ] || ( \
     _bin64="${IPXE_PCBIOS64}" \
-    && make -C /build/src/ EXTRA_CFLAGS="-fno-pie" ${_bin64} -j8 \
+    && make -C /build/src/ EXTRA_CFLAGS="-fno-pie" ${_bin64} EMBED=chain.ipxe -j8 \
     && mkdir -p bin-x86_64-pcbios/ \
     && for file in ${_bin64} ;do ln -v /build/src/${file} /ipxe/${file} ;done \
     )
@@ -129,12 +133,14 @@ WORKDIR /ipxe/
 
 # Compile the files in "bin-arm64-efi/"
 SHELL ["/bin/bash", "-c"]
+# The following is too anticipate DHCP delays in the network
+RUN echo -e '#!ipxe\n\ndhcp\nchain \${67}' > /build/src/chain.ipxe
 ARG IPXE_ARM_EFI64="bin-arm64-efi/ipxe.efi bin-arm64-efi/ipxe.usb bin-arm64-efi/snponly.efi"
 # _arm64="bin-arm64-efi/${IPXE_ARM_EFI64// / bin-arm64-efi\/}" \
 RUN [ -z "${IPXE_ARM_EFI64}" ] || ( \
     _arm64="${IPXE_ARM_EFI64}" \
     && PATH=${PATH}:/build/src/util/:/build/src/ \
-    && make CROSS_COMPILE=aarch64-linux-gnu- ARCH=arm64 -C /build/src/ ${_arm64} -j8 \
+    && make CROSS_COMPILE=aarch64-linux-gnu- ARCH=arm64 -C /build/src/ ${_arm64} EMBED=chain.ipxe -j8 \
     && mkdir -p bin-arm64-efi/ \
     && for file in ${_arm64} ;do ln -v /build/src/${file} /ipxe/${file} ;done \
     )

dockerfiles/uos/uos.yml

@@ -84,7 +84,7 @@ files:
       # ssh-rsa fill-this-in-with-an-ssh-key-if-you-want
     mode: "0600"
   - path: etc/docker/daemon.json
-    contents: '{"debug": true}'
+    contents: '{"debug": true, "storage-driver": "vfs"}'
   - path: usr/local/bin/uos
     contents: |
       hostname uos

scripts/templateutils.sh

@@ -49,10 +49,10 @@ getMySubnet() {
 
 detectDHCP() {
     if [[ -z "${builder_config_interface+x}" ]]; then
-        local ip=$(docker run -it --rm --net=host --entrypoint="" builder-dnsmasq sh -c 'nmap --script broadcast-dhcp-discover 2> /dev/null | grep Identifier | awk "{print \$4}"' )
+        local ip=$(docker run -it --rm --net=host --entrypoint="" builder-dnsmasq sh -c 'nmap --script broadcast-dhcp-discover 2> /dev/null | grep Identifier | awk "{print \$4}" | head -n 1' )
         echo ${ip} | tr -d '\r' 2> /dev/null
     else
-        local ip=$(docker run -it --rm --net=host -e INTERFACE=${builder_config_interface} --entrypoint="" builder-dnsmasq sh -c 'nmap -e ${INTERFACE} --script broadcast-dhcp-discover 2> /dev/null | grep Identifier | awk "{print \$4}"' )
+        local ip=$(docker run -it --rm --net=host -e INTERFACE=${builder_config_interface} --entrypoint="" builder-dnsmasq sh -c 'nmap -e ${INTERFACE} --script broadcast-dhcp-discover 2> /dev/null | grep Identifier | awk "{print \$4}" | head -n 1' )
         echo ${ip} | tr -d '\r' 2> /dev/null
     fi
 }

template/dnsmasq/dnsmasq.conf

@@ -79,11 +79,10 @@ dhcp-boot=tag:BC_EFI,ipxe/efi64/ipxe.efi
 dhcp-boot=tag:X86-64_EFI,ipxe/efi64/ipxe.efi
 
 # Serve out UEFI HTTPClient Boot
-dhcp-match=set:X86-64_EFI_HTTP,option:client-arch,16
-dhcp-userclass=set:iPXE,iPXE
-dhcp-option=lan,tag:X86-64_EFI_HTTP,tag:!iPXE,option:bootfile-name,http://@@HOST_IP@@/tftp/ipxe/efi64/ipxe.efi
-dhcp-option=lan,tag:X86-64_EFI_HTTP,tag:!iPXE,option:vendor-class,HTTPClient
-dhcp-boot=tag:X86-64_EFI_HTTP,http://@@HOST_IP@@/tftp/ipxe/efi64/ipxe.efi
+dhcp-pxe-vendor=PXEClient,HTTPClient:Arch:00016
+dhcp-vendorclass=set:X86-64_EFI,HTTPClient:Arch:00016
+dhcp-option-force=tag:X86-64_EFI,60,HTTPClient
+dhcp-boot=tag:X86-64_EFI,"http://@@HOST_IP@@/tftp/ipxe/efi64/ipxe.efi"
 
 # Fallback to telling all other clients to boot
 dhcp-boot=tag:!X86-64_EFI,tag:!BC_EFI,tag:!IA32_EFI,ipxe/legacy/undionly.kpxe