diff --git a/src/BOOT_STRUCTURE_PARTS/isolinux/isolinux.cfg_sol-os_version b/src/BOOT_STRUCTURE_PARTS/isolinux/isolinux.cfg_gui_version similarity index 82% rename from src/BOOT_STRUCTURE_PARTS/isolinux/isolinux.cfg_sol-os_version rename to src/BOOT_STRUCTURE_PARTS/isolinux/isolinux.cfg_gui_version index 8ff60e9..5396c88 100644 --- a/src/BOOT_STRUCTURE_PARTS/isolinux/isolinux.cfg_sol-os_version +++ b/src/BOOT_STRUCTURE_PARTS/isolinux/isolinux.cfg_gui_version @@ -47,18 +47,30 @@ MENU COLOR tabmsg 31;40 #30ffffff #00000000 std LABEL solosLive MENU label ^Try Sol-OS KERNEL /casper/vmlinuz - append boot=casper initrd=/casper/initrd.gz file=/images/filesystem.squashfs quiet + APPEND file=/cdrom/preseed/ubuntu.seed boot=casper initrd=/casper/initrd.lz quiet -- LABEL solosInstall MENU label ^Install Sol-OS KERNEL /casper/vmlinuz - APPEND boot=casper initrd=/casper/initrd.gz file=/images/filesystem.squashfs finstall quiet splash + APPEND file=/cdrom/preseed/ubuntu.seed boot=casper initrd=/casper/initrd.lz finstall quiet -- + MENU SEPARATOR +LABEL check + MENU label ^Check CD for defects + KERNEL /casper/vmlinuz + APPEND boot=casper integrity-check initrd=/casper/initrd.lz quiet -- + +LABEL memtest + menu label ^Memory test + kernel /install/memtest + append - + LABEL hd MENU label ^Boot from first hard disk localboot 0x80 + APPEND - LABEL reboot MENU LABEL ^Reboot diff --git a/src/BOOT_STRUCTURE_PARTS/isolinux/isolinux.cfg b/src/BOOT_STRUCTURE_PARTS/isolinux/isolinux.cfg_text_version similarity index 100% rename from src/BOOT_STRUCTURE_PARTS/isolinux/isolinux.cfg rename to src/BOOT_STRUCTURE_PARTS/isolinux/isolinux.cfg_text_version diff --git a/src/BOOT_STRUCTURE_PARTS/isolinux/splash.png b/src/BOOT_STRUCTURE_PARTS/isolinux/splash.png new file mode 100644 index 0000000..664c6f2 Binary files /dev/null and b/src/BOOT_STRUCTURE_PARTS/isolinux/splash.png differ diff --git a/src/BOOT_STRUCTURE_PARTS/splash_screen/isolinux.txt b/src/BOOT_STRUCTURE_PARTS/splash_screen/isolinux.txt index 3796bd3..f5062d5 100644 --- a/src/BOOT_STRUCTURE_PARTS/splash_screen/isolinux.txt +++ b/src/BOOT_STRUCTURE_PARTS/splash_screen/isolinux.txt @@ -5,4 +5,6 @@ This is an Ubuntu Remix Live CD. For the default live system, enter "live". To run memtest86+, enter "memtest" -************************************************************************ \ No newline at end of file +************************************************************************ + +--> : \ No newline at end of file diff --git a/src/step_3_create_boot_structure.sh b/src/step_3_create_boot_structure.sh index 01d4492..3222030 100755 --- a/src/step_3_create_boot_structure.sh +++ b/src/step_3_create_boot_structure.sh @@ -10,6 +10,20 @@ function main() { echo "Moving ISO linux parts..." move_iso_linux_parts; + + echo "\nWhich boot style do you want to use?" + echo "\t 1) Text Boot" + echo "\t 2) GUI Boot" + read -p "--> : " ANSR + while [[ $ANSR != "1" ]] && [[ $ANSR != "2" ]]; do + read -p "--> : " ANSR + done + case $ANSR in + "1" ) isolinux_text_boot; break;; + "2" ) isolinux_gui_boot; break;; + * ) echo "Don't know how you got here but that's a bad sign..."; break;; + esac + echo "Creating manifest..." create_manifest; echo "Squashing chroot filesystem..." @@ -32,8 +46,9 @@ function move_iso_linux_parts() { sudo cp "${CHROOT_PTH}"/boot/vmlinuz-5.4.**-**-generic image/casper/vmlinuz echo "Copying ${CHROOT_PTH}/boot/initrd.img-5.4.**-**-generic to image/casper/initrd.lz" sudo cp "${CHROOT_PTH}"/boot/initrd.img-5.4.**-**-generic image/casper/initrd.lz +} - +function isolinux_text_boot() { # We need the isolinux and memtest binaries. # (Note: some distros place file isolinux.bin under /usr/lib/syslinux .) sudo cp /usr/lib/ISOLINUX/isolinux.bin image/isolinux/ @@ -47,6 +62,16 @@ function move_iso_linux_parts() { cp BOOT_STRUCTURE_PARTS/splash_screen/splash.rle image/isolinux/ } + +function isolinux_gui_boot() { + # Use local options + sudo cp BOOT_STRUCTURE_PARTS/isolinux/* image/isolinux/ + sudo rm image/isolinux/isolinux.cfg_text_version + sudo mv image/isolinux/isolinux.cfg_gui_version image/isolinux/isolinux.cfg +} + + + function create_manifest() { sudo chroot ${CHROOT_PTH} dpkg-query -W --showformat='${Package} ${Version}\n' | sudo tee image/casper/filesystem.manifest sudo cp -v image/casper/filesystem.manifest image/casper/filesystem.manifest-desktop