Develop to master #3

Merged
maximstewart merged 18 commits from develop into master 2020-05-02 11:14:56 +00:00
5 changed files with 43 additions and 4 deletions
Showing only changes of commit 550279462d - Show all commits

View File

@ -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

Binary file not shown.

After

Width:  |  Height:  |  Size: 502 KiB

View File

@ -5,4 +5,6 @@ This is an Ubuntu Remix Live CD.
For the default live system, enter "live". To run memtest86+, enter "memtest"
************************************************************************
************************************************************************
--> :

View File

@ -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