2Shirt/WizardKit
2Shirt/WizardKit
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 26 Packages Wiki Activity Actions

Added wimboot and fixed pxe/syslinux backgrounds

Browse source
This commit is contained in:
2Shirt 2017-12-27 18:59:49 -07:00
parent cde9953b2a
commit c4adbd3ac0
5 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.linux_items/include/syslinux/wklive_head.cfg
View file

@ -1,7 +1,7 @@
SERIAL 0 38400 SERIAL 0 38400
UI boot/syslinux/vesamenu.c32 UI boot/syslinux/vesamenu.c32
MENU TITLE _______ MENU TITLE _______
MENU BACKGROUND boot/syslinux/syslinux.png MENU BACKGROUND syslinux.png
MENU WIDTH 80 MENU WIDTH 80
MENU MARGIN 10 MENU MARGIN 10

2
.linux_items/include/syslinux/wklive_pxe.cfg
View file

@ -1,5 +1,5 @@
INCLUDE boot/syslinux/wklive_head.cfg 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.cfg
INCLUDE boot/syslinux/wklive_pxe_winpe.cfg INCLUDE boot/syslinux/wklive_pxe_winpe.cfg

2
.linux_items/include/syslinux/wklive_pxe_extras.cfg
View file

@ -1,5 +1,5 @@
INCLUDE boot/syslinux/wklive_head.cfg 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.cfg
INCLUDE boot/syslinux/wklive_pxe_linux_extras.cfg INCLUDE boot/syslinux/wklive_pxe_linux_extras.cfg

1
.linux_items/packages/dependencies
View file

@ -6,5 +6,6 @@ dos2unix
git git
libewf libewf
openssh openssh
p7zip
progsreiserfs progsreiserfs
rsync rsync

27
Build Linux
View file

@ -44,10 +44,10 @@ function cleanup() {
fi fi
fi fi
done done
mkdir "$BUILD_DIR" 2>/dev/null mkdir -p "$BUILD_DIR" 2>/dev/null
mkdir "$LOG_DIR" 2>/dev/null mkdir -p "$LOG_DIR" 2>/dev/null
mkdir "$OUT_DIR" 2>/dev/null mkdir -p "$OUT_DIR" 2>/dev/null
mkdir "$TEMP_DIR" 2>/dev/null mkdir -p "$TEMP_DIR" 2>/dev/null
} }
function fix_kit_permissions() { function fix_kit_permissions() {
@ -103,8 +103,8 @@ function copy_live_env() {
rm "$LIVE_DIR/airootfs/etc/udev/rules.d/81-dhcpcd.rules" 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/rules.d" --ignore-fail-on-non-empty
rmdir "$LIVE_DIR/airootfs/etc/udev" --ignore-fail-on-non-empty rmdir "$LIVE_DIR/airootfs/etc/udev" --ignore-fail-on-non-empty
rm "$LIVE_DIR/isolinux/*.cfg" rm "$LIVE_DIR/isolinux"/*.cfg
rm "$LIVE_DIR/syslinux/*.cfg" "$LIVE_DIR/syslinux/*.png" rm "$LIVE_DIR/syslinux"/*.cfg "$LIVE_DIR/syslinux"/*.png
# Add items # Add items
rsync -aI "$ROOT_DIR/.linux_items/include/" "$LIVE_DIR/" 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:]")" username="$(echo "${KIT_NAME_SHORT}tech" | tr "[:upper:]" "[:lower:]")"
# Boot config (legacy) # Boot config (legacy)
cp "$ROOT_DIR/Images/Pxelinux.png" "$LIVE_DIR/syslinux/pxelinux.png" mkdir -p "$LIVE_DIR/wklive"
cp "$ROOT_DIR/Images/Syslinux.png" "$LIVE_DIR/syslinux/syslinux.png" 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" 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 # Hostname
echo "$hostname" > "$LIVE_DIR/airootfs/etc/hostname" echo "$hostname" > "$LIVE_DIR/airootfs/etc/hostname"
echo "127.0.1.1 $hostname.localdomain $hostname" >> "$LIVE_DIR/airootfs/etc/hosts" echo "127.0.1.1 $hostname.localdomain $hostname" >> "$LIVE_DIR/airootfs/etc/hosts"