v3.0.1

intel · Dec 1, 2022 · 800ab23 · 800ab23
1 parent d26008d
commit 800ab23
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -199,7 +199,18 @@ 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.1] - 2022-11-30
+### Added
+- Added additional kernel modules to the ESP uOS
+
+### Changed
+- Fixed WEBROOT creation with Gitea is disabled
+- Fixed USB image size calculation
+- Fixed ESP build when dynamic profile is active 
+- Updated the version of docker-compose inside core container
 
+### 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
@@ -217,3 +228,4 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 [2.5.3]: https://github.com/intel/Edge-Software-Provisioner/compare/v2.5.2...v2.5.3
 [2.5.4]: https://github.com/intel/Edge-Software-Provisioner/compare/v2.5.3...v2.5.4
 [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
diff --git a/build.sh b/build.sh
@@ -497,6 +497,7 @@ if [[ "${DYNAMIC_PROFILE}" == "false" ]]; then
     profilesActions genProfilePxeMenu
     genPxeMenuTail
 
+    printBanner "Generating ${C_GREEN}IPXE Menu..."
     logMsg "Generating IPXE Menu..."
     genIpxeMenuHead
     profilesActions genProfileIpxeMenu

diff --git a/dockerfiles/core/Dockerfile b/dockerfiles/core/Dockerfile
@@ -7,13 +7,13 @@ LABEL maintainer "Bryan J Rodriguez <[email protected]>"
 RUN apk --no-cache add  \
       bash \
       dumb-init \
+      docker-compose \
       inotify-tools \
       git \
       nmap \
       nmap-scripts \
       rsync \
       syslinux \
-      docker-compose \
       wget && \
     apk --no-cache -U upgrade && \
     update-ca-certificates

diff --git a/scripts/profileutils.sh b/scripts/profileutils.sh
@@ -1396,7 +1396,7 @@ genProfileUsbBoot() {
         export CALC_IMG_SIZE=$(( ((${KERNEL_SIZE} + ${INITRD_SiZE} + 52428800)/4096) + ( (${KERNEL_SIZE} + ${INITRD_SiZE} + 52428800) % 4096 > 0 ) ))
 
         if [ "${USB_BIOS}" == "efi" ]; then
-            docker run -it --rm --privileged ${DOCKER_RUN_ARGS} -v /dev:/dev:shared -v $(pwd)/data:/data -v $(pwd)/${usb_path}/${name}:/usb ${UOS_BUILDER} -c "IMG_SIZE=\${CALC_IMG_SIZE} && \
+            docker run -it --rm --privileged ${DOCKER_RUN_ARGS} -v /dev:/dev:shared -v $(pwd)/data:/data -v $(pwd)/${usb_path}/${name}:/usb ${UOS_BUILDER} -c "IMG_SIZE=${CALC_IMG_SIZE} && \
                 truncate --io-blocks --size \${IMG_SIZE} /usb/temp.img && \
                 TEMP_IMG_DEV=\$(losetup --find --show /usb/temp.img) && \
                 dd bs=440 count=1 conv=notrunc if=/usr/share/syslinux/gptmbr.bin of=\${TEMP_IMG_DEV} > /dev/null 2>&1 && \
@@ -1417,7 +1417,7 @@ genProfileUsbBoot() {
                 mv /usb/temp.img /usb/${IMG_NAME}.img"
             umount /dev/console
         else
-            docker run -it --rm --privileged ${DOCKER_RUN_ARGS} -v /dev:/dev:shared -v $(pwd)/data:/data -v $(pwd)/${usb_path}/${name}:/usb ${UOS_BUILDER} -c "IMG_SIZE=\${CALC_IMG_SIZE} && \
+            docker run -it --rm --privileged ${DOCKER_RUN_ARGS} -v /dev:/dev:shared -v $(pwd)/data:/data -v $(pwd)/${usb_path}/${name}:/usb ${UOS_BUILDER} -c "IMG_SIZE=${CALC_IMG_SIZE} && \
                 truncate --io-blocks --size \${IMG_SIZE} /usb/temp.img && \
                 TEMP_IMG_DEV=\$(losetup --find --show /usb/temp.img) && \
                 parted --script \${TEMP_IMG_DEV} mklabel msdos mkpart primary fat32 1MiB 100% set 1 boot on && \

diff --git a/scripts/pxemenuutils.sh b/scripts/pxemenuutils.sh
@@ -16,6 +16,7 @@ genPxeMenuHead() {
 }
 
 genIpxeMenuHead() {
+    makeDirectory "${WEB_ROOT}"
     cp "./template/ipxe/menu.ipxe.head" "${WEB_ROOT}/tmp_menu.ipxe"
 }
 

diff --git a/scripts/templateutils.sh b/scripts/templateutils.sh
@@ -210,13 +210,16 @@ renderSystemNetworkTemplates() {
     local tmpDnsMasqConf="template/dnsmasq/dnsmasq.conf"
     if [[ ${DYNAMIC_PROFILE} == "false" ]];then
         local tmpPxeMenuFile=$(getTmpPxeMenuLocation)
+        local tmpIpxeMenuFile=$(getTmpIpxeMenuLocation)
     else
         local tmpPxeMenuFile="template/pxelinux.cfg/default.dynamic"
+        local tmpIpxeMenuFile="template/ipxe/menu.ipxe.head"
     fi
 
     # Copy template files
     copySampleFile ${tmpDnsMasqConf} ${tmpDnsMasqConf}.modified
     copySampleFile ${tmpPxeMenuFile} ${tmpPxeMenuFile}.modified
+    copySampleFile ${tmpIpxeMenuFile} ${tmpIpxeMenuFile}.modified
 
     # Replace the template variables with their appropriate values
     local dhcpRangeMinimumPlaceholder=("@@DHCP_MIN@@" "@@ESP_DHCP_MIN@@" "@@RNI_DHCP_MIN@@" "@@EDGEBUILDER_DHCP_MIN@@")
@@ -235,7 +238,7 @@ renderSystemNetworkTemplates() {
     # Note that profile-scoped variables are not accessible here.
     # In order to gain access to that scope use the renderTemplate
     # functionality
-    local stgFiles=("${tmpDnsMasqConf}.modified" "${tmpPxeMenuFile}.modified" "${WEB_ROOT}/tmp_menu.ipxe")
+    local stgFiles=("${tmpDnsMasqConf}.modified" "${tmpPxeMenuFile}.modified" "${tmpIpxeMenuFile}.modified")
     for stgFile in ${stgFiles[@]}; do
         for i in {0..2}
         do
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,6 +16,7 @@ genPxeMenuHead() { @@
     }
     genIpxeMenuHead() {
+        makeDirectory "${WEB_ROOT}"
         cp "./template/ipxe/menu.ipxe.head" "${WEB_ROOT}/tmp_menu.ipxe"
     }
@@ Expand Down @@