Use common ISO for all models

.github/workflows/CI.yml

@@ -6,39 +6,6 @@ on:
 
 jobs:
 
-  Safe-graphics:
-    runs-on: ubuntu-22.04
-    steps:
-      - name: 'Checkout mainline Repo'
-        uses: actions/checkout@v3
-
-      - name: Get version
-        run: |
-         VERSION=$(grep ^KERNEL_VERSION build.sh | head -n1| cut -d = -f2)
-         REL=$(grep "PKGREL=\d*" build.sh | cut -d = -f2)
-         echo "ver=${VERSION}" >> $GITHUB_ENV
-         echo "release=${REL}" >> $GITHUB_ENV
-          
-      - name: 'Checkout mainline-16,4 Repo'
-        uses: actions/checkout@v3
-        with:
-          ref: mainline-16,4
-          persist-credentials: false
-
-      - name: 'Push new version to mainline-16,4'
-        id: publish
-        run: |
-         sed -i "s/KERNEL_VERSION=6.*/KERNEL_VERSION=${{ env.ver }}/g" build.sh
-         sed -i "s/PKGREL=.*/PKGREL=${{ env.release }}/g" build.sh
-         git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
-         git config --local user.name "github-actions[bot]"
-         git commit -m "${{ env.ver }}-${{ env.release }}" -a
-      - name: Push changes to the repo
-        uses: ad-m/github-push-action@master
-        with:
-          github_token: ${{ secrets.PAT }}
-          branch: mainline-16,4
-
   ISO:
     runs-on: ubuntu-22.04
     steps:
@@ -89,7 +56,8 @@ jobs:
         uses: softprops/action-gh-release@v1
         with:
           #files: ${{ github.workspace }}/ISO/*.tar.gz
-          files: ${{ github.workspace }}/ISO/*.iso
+          #files: ${{ github.workspace }}/ISO/*.iso
+          files: ${{ github.workspace }}/output/*
           tag_name: v${{ env.isotag }}
           body_path: ${{ github.workspace }}/.github/workflows/instructions.txt
           draft: false

.github/workflows/instructions.txt

@@ -2,6 +2,8 @@ If you are facing blank screen after installation, try [booting using refind](ht
 
 Follow [this guide](https://wiki.t2linux.org/guides/wifi-bluetooth/) for Wi-Fi and Bluetooth to work.
 
-Users of **MacBookPro16,4** are recommended to use the safe graphics ISO as the kernel doesn't have the driver for their AMD Graphics Card. Rest users can use the normal ISO. After installing, follow [this guide](https://wiki.t2linux.org/guides/hybrid-graphics/#macbookpro164) to enable Intel GPU for graphics acceleration.
+Users of **MacBookPro16,4** are recommended to choose the **Safe Graphics** option from the grub menu while booting the ISO as the kernel doesn't have the driver for their AMD Graphics Card. Rest users can use the other options. After installing, follow [this guide](https://wiki.t2linux.org/guides/hybrid-graphics/#macbookpro164) to enable Intel GPU for graphics acceleration.
 
 **Getting kernel updates :-** Post installation, users are recommended to set up the [kernel update script](https://github.com/t2linux/T2-Ubuntu-Kernel#installation) to receive kernel updates.
+
+To make downloading the ISO easier, you can simply run the `iso.sh` script from the Assets below in macOS or Linux.

build.sh

@@ -85,7 +85,7 @@ do
   fi
   ### Zip iso and split it into multiple parts - github max size of release attachment is 2GB, where ISO is sometimes bigger than that
   cd "${ROOT_PATH}"
-  zip -s 1500m "${ROOT_PATH}/output/livecd-${KERNEL_VERSION}-${ALTERNATIVE}.zip" "${ROOT_PATH}/ubuntu-23.04-${KERNEL_VERSION}-${ALTERNATIVE}.iso"
+  zip -s 1500m "${ROOT_PATH}/output/ubuntu-23.04-${KERNEL_VERSION}-${ALTERNATIVE}.zip" "${ROOT_PATH}/ubuntu-23.04-${KERNEL_VERSION}-${ALTERNATIVE}.iso"
 done
 ## Calculate sha256 sums of built ISO
 sha256sum "${ROOT_PATH}"/*.iso >"${ROOT_PATH}/output/sha256"

files/grub/grub.cfg

@@ -11,7 +11,7 @@ menuentry "Try Ubuntu Lunar Lobster without installing" {
    initrd /casper/initrd
 }
 menuentry "Try Ubuntu Lunar Lobster without installing (Safe Graphics)" {
-   linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro nomodeset pcie_ports=compat intel_iommu=on iommu=pt ---
+   linux /casper/vmlinuz file=/cdrom/preseed/mbp164.seed boot=casper ro nomodeset pcie_ports=compat intel_iommu=on iommu=pt ---
    initrd /casper/initrd
 }
 menuentry "Try Ubuntu Lunar Lobster without installing (NVMe blacklisted)" {
@@ -22,6 +22,10 @@ menuentry "Install Ubuntu Lunar Lobster" {
    linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp.seed boot=casper only-ubiquity pcie_ports=compat intel_iommu=on iommu=pt ---
    initrd /casper/initrd
 }
+menuentry "Install Ubuntu Lunar Lobster (Safe Graphics)" {
+   linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp164.seed boot=casper only-ubiquity nomodeset pcie_ports=compat intel_iommu=on iommu=pt ---
+   initrd /casper/initrd
+}
 menuentry "Install Ubuntu Lunar Lobster (NVMe blacklisted)" {
    linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp.seed boot=casper only-ubiquity pcie_ports=compat intel_iommu=on iommu=pt modprobe.blacklist=nvme ---
    initrd /casper/initrd

files/preseed/mbp164.seed

@@ -0,0 +1,11 @@
+# Enable extras.ubuntu.com.
+# d-i apt-setup/extra boolean true
+# Install the Ubuntu desktop.
+# tasksel tasksel/first multiselect ubuntu-desktop
+# On live DVDs, don't spend huge amounts of time removing substantial
+# application packages pulled in by language packs. Given that we clearly
+# have the space to include them on the DVD, they're useful and we might as
+# well keep them installed.
+#ubiquity ubiquity/keep-installed string icedtea6-plugin openoffice.org
+
+d-i debian-installer/add-kernel-opts string pcie_ports=compat intel_iommu=on iommu=pt nomodeset