From c4adbd3ac0ff9c1a1f37f78e21f486d31c7326fd Mon Sep 17 00:00:00 2001
From: 2Shirt <1923621+2Shirt@users.noreply.github.com>
Date: Wed, 27 Dec 2017 18:59:49 -0700
Subject: [PATCH] Added wimboot and fixed pxe/syslinux backgrounds

---
 .linux_items/include/syslinux/wklive_head.cfg |  2 +-
 .linux_items/include/syslinux/wklive_pxe.cfg  |  2 +-
 .../include/syslinux/wklive_pxe_extras.cfg    |  2 +-
 .linux_items/packages/dependencies            |  1 +
 Build Linux                                   | 27 ++++++++++++-------
 5 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/.linux_items/include/syslinux/wklive_head.cfg b/.linux_items/include/syslinux/wklive_head.cfg
index 21c4a2d3..7562755a 100644
--- a/.linux_items/include/syslinux/wklive_head.cfg
+++ b/.linux_items/include/syslinux/wklive_head.cfg
@@ -1,7 +1,7 @@
 SERIAL 0 38400
 UI boot/syslinux/vesamenu.c32
 MENU TITLE _______
-MENU BACKGROUND boot/syslinux/syslinux.png
+MENU BACKGROUND syslinux.png
 
 MENU WIDTH 80
 MENU MARGIN 10
diff --git a/.linux_items/include/syslinux/wklive_pxe.cfg b/.linux_items/include/syslinux/wklive_pxe.cfg
index cc696837..7ad1198c 100644
--- a/.linux_items/include/syslinux/wklive_pxe.cfg
+++ b/.linux_items/include/syslinux/wklive_pxe.cfg
@@ -1,5 +1,5 @@
 INCLUDE boot/syslinux/wklive_head.cfg
-MENU BACKGROUND boot/syslinux/pxelinux.png
+MENU BACKGROUND pxelinux.png
 
 INCLUDE boot/syslinux/wklive_pxe_linux.cfg
 INCLUDE boot/syslinux/wklive_pxe_winpe.cfg
diff --git a/.linux_items/include/syslinux/wklive_pxe_extras.cfg b/.linux_items/include/syslinux/wklive_pxe_extras.cfg
index 4c1c0328..d5a953a5 100644
--- a/.linux_items/include/syslinux/wklive_pxe_extras.cfg
+++ b/.linux_items/include/syslinux/wklive_pxe_extras.cfg
@@ -1,5 +1,5 @@
 INCLUDE boot/syslinux/wklive_head.cfg
-MENU BACKGROUND boot/syslinux/pxelinux.png
+MENU BACKGROUND pxelinux.png
 
 INCLUDE boot/syslinux/wklive_pxe_linux.cfg
 INCLUDE boot/syslinux/wklive_pxe_linux_extras.cfg
diff --git a/.linux_items/packages/dependencies b/.linux_items/packages/dependencies
index 1b01cc6b..9cdf5910 100644
--- a/.linux_items/packages/dependencies
+++ b/.linux_items/packages/dependencies
@@ -6,5 +6,6 @@ dos2unix
 git
 libewf
 openssh
+p7zip
 progsreiserfs
 rsync
diff --git a/Build Linux b/Build Linux
index 3dd06572..fbafb99e 100755
--- a/Build Linux	
+++ b/Build Linux	
@@ -44,10 +44,10 @@ function cleanup() {
             fi
         fi
     done
-    mkdir "$BUILD_DIR" 2>/dev/null
-    mkdir "$LOG_DIR" 2>/dev/null
-    mkdir "$OUT_DIR" 2>/dev/null
-    mkdir "$TEMP_DIR" 2>/dev/null
+    mkdir -p "$BUILD_DIR" 2>/dev/null
+    mkdir -p "$LOG_DIR" 2>/dev/null
+    mkdir -p "$OUT_DIR" 2>/dev/null
+    mkdir -p "$TEMP_DIR" 2>/dev/null
 }
 
 function fix_kit_permissions() {
@@ -103,8 +103,8 @@ function copy_live_env() {
     rm "$LIVE_DIR/airootfs/etc/udev/rules.d/81-dhcpcd.rules"
     rmdir "$LIVE_DIR/airootfs/etc/udev/rules.d" --ignore-fail-on-non-empty
     rmdir "$LIVE_DIR/airootfs/etc/udev" --ignore-fail-on-non-empty
-    rm "$LIVE_DIR/isolinux/*.cfg"
-    rm "$LIVE_DIR/syslinux/*.cfg" "$LIVE_DIR/syslinux/*.png"
+    rm "$LIVE_DIR/isolinux"/*.cfg
+    rm "$LIVE_DIR/syslinux"/*.cfg "$LIVE_DIR/syslinux"/*.png
     
     # Add items
     rsync -aI "$ROOT_DIR/.linux_items/include/" "$LIVE_DIR/"
@@ -128,10 +128,19 @@ function update_live_env() {
     username="$(echo "${KIT_NAME_SHORT}tech" | tr "[:upper:]" "[:lower:]")"
 
     # Boot config (legacy)
-    cp "$ROOT_DIR/Images/Pxelinux.png" "$LIVE_DIR/syslinux/pxelinux.png"
-    cp "$ROOT_DIR/Images/Syslinux.png" "$LIVE_DIR/syslinux/syslinux.png"
+    mkdir -p "$LIVE_DIR/wklive"
+    cp "$ROOT_DIR/Images/Pxelinux.png" "$LIVE_DIR/wklive/pxelinux.png"
+    cp "$ROOT_DIR/Images/Syslinux.png" "$LIVE_DIR/wklive/syslinux.png"
     sed -i -r "s/_+/$KIT_NAME_FULL/" "$LIVE_DIR/syslinux/wklive_head.cfg"
-    
+    mkdir -p "$TEMP_DIR" 2>/dev/null
+    curl -Lo "$TEMP_DIR/wimboot.zip" "http://git.ipxe.org/releases/wimboot/wimboot-latest.zip"
+    7z e "$TEMP_DIR/wimboot.zip" -o"$LIVE_DIR/wklive/boot" 'wimboot*/LICENSE.txt' 'wimboot*/README.txt' 'wimboot*/wimboot'
+
+    # build.sh
+    if ! grep -iq 'customize_iso' "$LIVE_DIR/build.sh"; then
+        sed -i -r 's!run_once make_iso$!# customize_iso\nrsync -aI "${script_path}/wklive/" "${work_dir}/iso/wklive/"\n\nrun_once make_iso!' "$LIVE_DIR/build.sh"
+    fi
+
     # Hostname
     echo "$hostname" > "$LIVE_DIR/airootfs/etc/hostname"
     echo "127.0.1.1  $hostname.localdomain  $hostname" >> "$LIVE_DIR/airootfs/etc/hosts"