diff --git a/.github/dependabot.yml b/.github/dependabot.yml index bc7f429..ae992e3 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,18 +5,3 @@ updates: directory: "/" schedule: interval: "daily" - - package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "daily" - target-branch: "mainline" - - package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "daily" - target-branch: "kubuntuMainline" - - package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "daily" - target-branch: "kubuntuLTS" diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index dc33051..805f277 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -5,79 +5,134 @@ on: [push, workflow_dispatch] jobs: - Mainline: + + Cinnamon: runs-on: ubuntu-22.04 steps: - - name: 'Checkout LTS Repo' - uses: actions/checkout@v4 + - uses: actions/checkout@v4 + + - name: Build + run: sudo ./build.sh cinnamon + + - name: print sha256sum + run: cat output/sha256* - - name: Get version + - name: Generate Tag + id: tag 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 Repo' - uses: actions/checkout@v4 + VER=$(egrep ^KERNEL_VERSION build.sh|cut -d= -f2) + REL=$(grep "PKGREL=\d*" build.sh | cut -d = -f2) + echo Version is $VER + echo "isotag=${VER}-${REL}" >> $GITHUB_ENV + + - name: Upload iso artifact + uses: actions/upload-artifact@v4 with: - ref: mainline - persist-credentials: false + name: mbp-linuxmint-cinnamon-${{ steps.tag.outputs.tag }}.z01 + path: ${{ github.workspace }}/output/* - - name: 'Push new version to mainline' - id: publish + - name: Instructions for putting it back together 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 + cat << EOF + Download all the artifacts, and put them in a folder + without other files. Then run:" + unzip "*.z??.zip" + cat livecd-${{ env.isotag }}-t2.z?? > cd.zip + echo unzip cd.zip + EOF - Kubuntu: + - name: Compress ISO + run: | + cd ${{ github.workspace }} + mkdir ISO + mv ${{ github.workspace }}/*.iso ${{ github.workspace }}/ISO + cd ISO + ISONAME=$(ls ${{ github.workspace }}/ISO | grep .iso | rev | cut -c 5- | rev) + tar -czvf ${ISONAME}.tar.gz ${ISONAME}.iso + ls -l + + - name: Get the ISO script + run: | + sudo cp ${{ github.workspace }}/.github/workflows/iso.sh ${{ github.workspace }}/output/iso.sh + + - name: Release + if: github.ref == 'refs/heads/main' + uses: softprops/action-gh-release@v2 + with: + #files: ${{ github.workspace }}/ISO/*.tar.gz + #files: ${{ github.workspace }}/ISO/*.iso + files: ${{ github.workspace }}/output/* + tag_name: v${{ env.isotag }} + body_path: ${{ github.workspace }}/.github/workflows/instructions.txt + draft: false + prerelease: false + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + Mate: runs-on: ubuntu-22.04 steps: - - name: 'Checkout LTS Repo' - uses: actions/checkout@v4 + - uses: actions/checkout@v4 + + - name: Build + run: sudo ./build.sh mate - - name: Get version + - name: print sha256sum + run: cat output/sha256* + + - name: Generate Tag + id: tag 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 kubuntuLTS Repo' - uses: actions/checkout@v4 + VER=$(egrep ^KERNEL_VERSION build.sh|cut -d= -f2) + REL=$(grep "PKGREL=\d*" build.sh | cut -d = -f2) + echo Version is $VER + echo "isotag=${VER}-${REL}" >> $GITHUB_ENV + + - name: Upload iso artifact + uses: actions/upload-artifact@v4 with: - ref: kubuntuLTS - persist-credentials: false + name: mbp-linuxmint-mate-${{ steps.tag.outputs.tag }}.z01 + path: ${{ github.workspace }}/output/* - - name: 'Push new version to kubuntuLTS' - id: publish + - name: Instructions for putting it back together 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: kubuntuLTS + cat << EOF + Download all the artifacts, and put them in a folder + without other files. Then run:" + unzip "*.z??.zip" + cat livecd-${{ env.isotag }}-t2.z?? > cd.zip + echo unzip cd.zip + EOF + + - name: Compress ISO + run: | + cd ${{ github.workspace }} + mkdir ISO + mv ${{ github.workspace }}/*.iso ${{ github.workspace }}/ISO + cd ISO + ISONAME=$(ls ${{ github.workspace }}/ISO | grep .iso | rev | cut -c 5- | rev) + tar -czvf ${ISONAME}.tar.gz ${ISONAME}.iso + ls -l - ISO: + - name: Release + if: github.ref == 'refs/heads/main' + uses: softprops/action-gh-release@v2 + with: + #files: ${{ github.workspace }}/ISO/*.tar.gz + #files: ${{ github.workspace }}/ISO/*.iso + files: ${{ github.workspace }}/output/* + tag_name: v${{ env.isotag }} + body_path: ${{ github.workspace }}/.github/workflows/instructions.txt + draft: false + prerelease: false + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + XFCE: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - name: Build - run: sudo ./build_in_docker.sh + run: sudo ./build.sh xfce - name: print sha256sum run: cat output/sha256* @@ -93,7 +148,7 @@ jobs: - name: Upload iso artifact uses: actions/upload-artifact@v4 with: - name: mbp-ubuntu-${{ steps.tag.outputs.tag }}.z01 + name: mbp-linuxmint-xfce-${{ steps.tag.outputs.tag }}.z01 path: ${{ github.workspace }}/output/* - name: Instructions for putting it back together @@ -116,12 +171,8 @@ jobs: tar -czvf ${ISONAME}.tar.gz ${ISONAME}.iso ls -l - - name: Get the ISO script - run: | - sudo cp ${{ github.workspace }}/.github/workflows/iso.sh ${{ github.workspace }}/output/iso.sh - - name: Release - if: github.ref == 'refs/heads/LTS' + if: github.ref == 'refs/heads/main' uses: softprops/action-gh-release@v2 with: #files: ${{ github.workspace }}/ISO/*.tar.gz @@ -132,4 +183,4 @@ jobs: draft: false prerelease: false env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/01_build_file_system.sh b/01_build_file_system.sh index fbd5800..fcbc785 100755 --- a/01_build_file_system.sh +++ b/01_build_file_system.sh @@ -1,20 +1,21 @@ #!/bin/bash set -eu -o pipefail -echo >&2 "===]> Info: Checkout bootstrap... " -debootstrap \ - --arch=amd64 \ - --variant=minbase \ - jammy \ - "${CHROOT_PATH}" \ - http://archive.ubuntu.com/ubuntu/ +echo >&2 "===]> Info: Download ISO and Unsquash FS" +cd "${ROOT_PATH}" +wget "https://mirrors.edge.kernel.org/linuxmint/stable/${MINT_VERSION}/linuxmint-${MINT_VERSION}-${FLAVOUR}-64bit.iso" +mount "linuxmint-${MINT_VERSION}-${FLAVOUR}-64bit.iso" /mnt +cp /mnt/casper/filesystem.squashfs "${ROOT_PATH}" +unsquashfs "${ROOT_PATH}/filesystem.squashfs" +mv squashfs-root "${CHROOT_PATH}" + echo >&2 "===]> Info: Creating chroot environment... " mount --bind /dev "${CHROOT_PATH}/dev" mount --bind /run "${CHROOT_PATH}/run" cp -r "${ROOT_PATH}/files" "${CHROOT_PATH}/tmp/setup_files" -chroot "${CHROOT_PATH}" /bin/bash -c "KERNEL_VERSION=${KERNEL_VERSION} /tmp/setup_files/chroot_build.sh" +chroot "${CHROOT_PATH}" /bin/bash -c "KERNEL_VERSION=${KERNEL_VERSION} CODENAME=${CODENAME} /tmp/setup_files/chroot_build.sh" echo >&2 "===]> Info: Cleanup the chroot environment... " # In docker there is no run? diff --git a/02_build_image.sh b/02_build_image.sh index 1f8a66a..20ec7ea 100755 --- a/02_build_image.sh +++ b/02_build_image.sh @@ -37,7 +37,7 @@ done echo >&2 "===]> Info: Create diskdefines... " cat <"${IMAGE_PATH}"/README.diskdefines -#define DISKNAME Ubuntu MBP 22.04 LTS "Jammy Jellyfish" - Beta amd64 +#define DISKNAME Linux Mint MBP ${MINT_VERSION} "Virginia" - Beta amd64 #define TYPE binary #define TYPEbinary 1 #define ARCH amd64 diff --git a/04_create_iso.sh b/04_create_iso.sh index 0abbe28..8a7c3a2 100755 --- a/04_create_iso.sh +++ b/04_create_iso.sh @@ -10,7 +10,7 @@ echo >&2 "===]> Info: Create Isolinux... " xorriso -as mkisofs \ -iso-level 3 \ -full-iso9660-filenames \ - -volid "UBUNTU_MBP" \ + -volid "LINUXMINT_MBP" \ -b boot/grub/bios.img \ -no-emul-boot \ -boot-load-size 4 \ @@ -23,7 +23,7 @@ xorriso -as mkisofs \ -no-emul-boot \ -isohybrid-mbr "${ROOT_PATH}/files/isohdpfx.bin" \ -isohybrid-gpt-basdat -isohybrid-apm-hfsplus \ - -output "${ROOT_PATH}/ubuntu-22.04-${KERNEL_VERSION}.iso" \ + -output "${ROOT_PATH}/linuxmint-${MINT_VERSION}-${FLAVOUR}-${KERNEL_VERSION}.iso" \ -graft-points \ "." \ /boot/grub/bios.img=isolinux/bios.img \ diff --git a/README.md b/README.md index 0ac4eef..6ba122a 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,16 @@ -# T2-Ubuntu +# T2-Mint -The ISOs from this repo should allow you to install Ubuntu without using an external keyboard or mouse on a T2 Mac. +The ISOs from this repo should allow you to install Linux Mint without using an external keyboard or mouse on a T2 Mac. -![CI](https://github.com/t2linux/T2-Ubuntu/actions/workflows/CI.yml/badge.svg?branch=jammy) +![CI](https://github.com/t2linux/T2-Mint/actions/workflows/CI.yml/badge.svg?branch=main) **If this repo helped you in any way, consider inviting a coffee to the people in the [credits](https://github.com/AdityaGarg8/T2-Ubuntu#credits), [link](https://wiki.t2linux.org/contribute/).** -Ubuntu ISO with Apple T2 patches built-in. Now we also support kubuntu thanks to [@lemmyg](https://github.com/lemmyg)! +Linux Mint ISO with Apple T2 patches built-in. Apple T2 drivers are integrated with this iso. -This repo is a rework of the great work done by [@mikeeq](https://github.com/mikeeq/mbp-fedora). It originally was [@marcosfad's mbp-ubuntu repo](https://github.com/marcosfad/mbp-ubuntu) and has been transferred to [t2linux](https://github.com/t2linux). +This repo is a based on [T2-Ubuntu](https://github.com/t2linux/T2-Ubuntu.git). Kernel is being used from - @@ -26,12 +26,12 @@ Bootloader is configure correctly out of the box. No workaround needed. ```bash diskutil list # found which number has the USB diskutil umountDisk /dev/diskX -sudo gdd bs=4M if=ubuntu-20.04-5.6.10-mbp.iso of=/dev/diskX conv=fdatasync status=progress +sudo gdd bs=4M if=linuxmint-21.3-cinnamon-6.8.9-t2-jammy.iso of=/dev/diskX conv=fdatasync status=progress ``` 4. Boot in Recovery mode and allow booting unknown OS 5. Restart and immediately press the option key until the Logo come up 6. Select "EFI Boot" (the third option was the one that worked for me) -7. Launch Ubuntu Live +7. Launch Linux Mint Live 8. Use Ubiquity to install (just click on it) 9. Select the options that work for you and use for the partition the following setup: * Leave the efi boot as preselected by the installer, unless you require a [separate efi partition](https://wiki.t2linux.org/guides/windows/#using-seperate-efi-partitions). diff --git a/build.sh b/build.sh index 1138ad2..36a2842 100755 --- a/build.sh +++ b/build.sh @@ -5,6 +5,9 @@ ROOT_PATH=$(pwd) WORKING_PATH=/root/work CHROOT_PATH="${WORKING_PATH}/chroot" IMAGE_PATH="${WORKING_PATH}/image" +CODENAME=jammy +FLAVOUR=$1 +MINT_VERSION=21.3 KERNEL_VERSION=6.8.9 PKGREL=1 sed -i "s/KVER/${KERNEL_VERSION}/g" $(pwd)/files/chroot_build.sh @@ -33,14 +36,15 @@ apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::=" dosfstools \ zip \ isolinux \ - syslinux + syslinux \ + wget echo >&2 "===]> Info: Start loop... " for ALTERNATIVE in t2-jammy do echo >&2 "===]> Info: Start building ${ALTERNATIVE}... " - echo >&2 "===]> Info: Build Ubuntu Jammy... " + echo >&2 "===]> Info: Build Filesystem from official ISO... " /bin/bash -c " ROOT_PATH=${ROOT_PATH} \\ WORKING_PATH=${WORKING_PATH} \\ @@ -48,10 +52,13 @@ do IMAGE_PATH=${IMAGE_PATH} \\ KERNEL_VERSION=${KERNEL_VERSION}-${ALTERNATIVE} \\ ALTERNATIVE=${ALTERNATIVE} \\ + CODENAME=${CODENAME} \\ + MINT_VERSION=${MINT_VERSION} \\ + FLAVOUR=${FLAVOUR} \\ ${ROOT_PATH}/01_build_file_system.sh " - echo >&2 "===]> Info: Build Image Jammy... " + echo >&2 "===]> Info: Build Image from modified Filesystem... " /bin/bash -c " ROOT_PATH=${ROOT_PATH} \\ WORKING_PATH=${WORKING_PATH} \\ @@ -59,6 +66,9 @@ do IMAGE_PATH=${IMAGE_PATH} \\ KERNEL_VERSION=${KERNEL_VERSION}-${ALTERNATIVE} \\ ALTERNATIVE=${ALTERNATIVE} \\ + CODENAME=${CODENAME} \\ + MINT_VERSION=${MINT_VERSION} \\ + FLAVOUR=${FLAVOUR} \\ ${ROOT_PATH}/02_build_image.sh " @@ -66,6 +76,9 @@ do /bin/bash -c " IMAGE_PATH=${IMAGE_PATH} \\ CHROOT_PATH=${CHROOT_PATH}_${ALTERNATIVE} \\ + CODENAME=${CODENAME} \\ + MINT_VERSION=${MINT_VERSION} \\ + FLAVOUR=${FLAVOUR} \\ ${ROOT_PATH}/03_prepare_iso.sh " @@ -76,6 +89,9 @@ do CHROOT_PATH=${CHROOT_PATH}_${ALTERNATIVE} \\ KERNEL_VERSION=${KERNEL_VERSION}-${ALTERNATIVE} \\ ALTERNATIVE=${ALTERNATIVE} \\ + CODENAME=${CODENAME} \\ + MINT_VERSION=${MINT_VERSION} \\ + FLAVOUR=${FLAVOUR} \\ ${ROOT_PATH}/04_create_iso.sh " livecd_exitcode=$? @@ -85,10 +101,10 @@ 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/ubuntu-22.04-${KERNEL_VERSION}-${ALTERNATIVE}.zip" "${ROOT_PATH}/ubuntu-22.04-${KERNEL_VERSION}-${ALTERNATIVE}.iso" + zip -s 1500m "${ROOT_PATH}/output/linuxmint-${MINT_VERSION}-${FLAVOUR}-${KERNEL_VERSION}-${ALTERNATIVE}.zip" "${ROOT_PATH}/linuxmint-${MINT_VERSION}-${FLAVOUR}-${KERNEL_VERSION}-${ALTERNATIVE}.iso" done ## Calculate sha256 sums of built ISO -sha256sum "${ROOT_PATH}"/*.iso >"${ROOT_PATH}/output/sha256-ubuntu-22.04" +sha256sum "${ROOT_PATH}"/*.iso >"${ROOT_PATH}/output/sha256-linuxmint-${MINT_VERSION}" find ./ | grep ".iso" find ./ | grep ".zip" diff --git a/build_in_docker.sh b/build_in_docker.sh index 014dbd0..bc953e3 100755 --- a/build_in_docker.sh +++ b/build_in_docker.sh @@ -11,4 +11,4 @@ docker run \ -t \ -v "$(pwd)":/repo \ ${DOCKER_IMAGE} \ - /bin/bash -c 'cd /repo && ./build.sh' + /bin/bash -c "cd /repo && ./build.sh $1" diff --git a/files/chroot_build.sh b/files/chroot_build.sh index e403807..bc9f84a 100755 --- a/files/chroot_build.sh +++ b/files/chroot_build.sh @@ -2,8 +2,6 @@ set -eu -o pipefail -CODENAME=jammy - echo >&2 "===]> Info: Configure environment... " mount none -t proc /proc @@ -13,21 +11,13 @@ mount none -t devpts /dev/pts export HOME=/root export LC_ALL=C -echo "ubuntu-${CODENAME}-live" >/etc/hostname - -echo >&2 "===]> Info: Configure and update apt... " +echo >&2 "===]> Info: Upgrade the system... " -cat </etc/apt/sources.list -deb http://archive.ubuntu.com/ubuntu/ ${CODENAME} main restricted universe multiverse -deb-src http://archive.ubuntu.com/ubuntu/ ${CODENAME} main restricted universe multiverse -deb http://archive.ubuntu.com/ubuntu/ ${CODENAME}-security main restricted universe multiverse -deb-src http://archive.ubuntu.com/ubuntu/ ${CODENAME}-security main restricted universe multiverse -deb http://archive.ubuntu.com/ubuntu/ ${CODENAME}-updates main restricted universe multiverse -deb-src http://archive.ubuntu.com/ubuntu/ ${CODENAME}-updates main restricted universe multiverse -EOF apt-get update +export DEBIAN_FRONTEND=noninteractive +apt-get upgrade -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" -echo >&2 "===]> Info: Install systemd and Ubuntu MBP Repo... " +echo >&2 "===]> Info: Install Ubuntu MBP Repo... " apt-get install -y systemd-sysv gnupg curl wget @@ -37,89 +27,19 @@ curl -s --compressed -o /etc/apt/sources.list.d/t2.list "https://adityagarg8.git echo "deb [signed-by=/etc/apt/trusted.gpg.d/t2-ubuntu-repo.gpg] https://github.com/AdityaGarg8/t2-ubuntu-repo/releases/download/${CODENAME} ./" | tee -a /etc/apt/sources.list.d/t2.list apt-get update -echo >&2 "===]> Info: Configure machine-id and divert... " - -dbus-uuidgen >/etc/machine-id -ln -fs /etc/machine-id /var/lib/dbus/machine-id -dpkg-divert --local --rename --add /sbin/initctl -ln -s /bin/true /sbin/initctl - -echo >&2 "===]> Info: Install packages needed for Live System... " - -export DEBIAN_FRONTEND=noninteractive -apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" \ - ubuntu-standard \ - sudo \ - casper \ - discover \ - laptop-detect \ - os-prober \ - network-manager \ - resolvconf \ - net-tools \ - wireless-tools \ - locales \ - initramfs-tools \ - binutils \ - linux-generic \ - linux-headers-generic \ - grub-efi-amd64-signed \ - intel-microcode \ - thermald \ - grub2 \ - nautilus-admin - -#curl -L https://github.com/t2linux/T2-Ubuntu-Kernel/releases/download/vKVER-PREL/linux-headers-KVER-${ALTERNATIVE}_KVER-PREL_amd64.deb > /tmp/headers.deb -#curl -L https://github.com/t2linux/T2-Ubuntu-Kernel/releases/download/vKVER-PREL/linux-image-KVER-${ALTERNATIVE}_KVER-PREL_amd64.deb > /tmp/image.deb -#file /tmp/* -#apt install /tmp/headers.deb /tmp/image.deb - echo >&2 "===]> Info: Install the T2 kernel... " apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" \ linux-t2=KVER-PREL-${CODENAME} -echo >&2 "===]> Info: Install window manager... " +echo >&2 "===]> Info: Install sound configuration... " apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" \ - plymouth-theme-ubuntu-logo \ - ubuntu-desktop-minimal \ - ubuntu-gnome-wallpapers \ - snapd - -echo >&2 "===]> Info: Install Graphical installer... " - -apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" \ - ubiquity \ - ubiquity-casper \ - ubiquity-frontend-gtk \ - ubiquity-slideshow-ubuntu \ - ubiquity-ubuntu-artwork - -echo >&2 "===]> Info: Install useful applications and sound configuration... " - -apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" \ - git \ - curl \ - nano \ - make \ - gcc \ - dkms \ - iwd \ apple-t2-audio-config -echo >&2 "===]> Info: Change initramfs format (for grub)... " -sed -i "s/COMPRESS=lz4/COMPRESS=gzip/g" "/etc/initramfs-tools/initramfs.conf" - echo >&2 "===]> Info: Configure drivers... " -# thunderbolt is working for me. -#printf '\nblacklist thunderbolt' >>/etc/modprobe.d/blacklist.conf - printf 'apple-bce' >>/etc/modules-load.d/t2.conf -#printf '\n### apple-bce start ###\nsnd\nsnd_pcm\napple-bce\n### apple-bce end ###' >>/etc/initramfs-tools/modules -#printf '\n# display f* key in touchbar\noptions apple-ib-tb fnmode=1\n' >> /etc/modprobe.d/apple-tb.conf -#printf '\n# delay loading of the touchbar driver\ninstall apple-ib-tb /bin/sleep 7; /sbin/modprobe --ignore-install apple-ib-tb' >> /etc/modprobe.d/delay-tb.conf echo >&2 "===]> Info: Update initramfs... " @@ -130,18 +50,6 @@ update-initramfs -u -v -k "${KERNEL_VERSION}" echo >&2 "===]> Info: Remove unused applications ... " apt-get purge -y -qq \ - transmission-gtk \ - transmission-common \ - gnome-mahjongg \ - gnome-mines \ - gnome-sudoku \ - aisleriot \ - hitori \ - xiterm+thai \ - make \ - gcc \ - vim \ - binutils \ linux-generic \ linux-headers-5.15.0-72 \ linux-headers-5.15.0-72-generic \ @@ -153,30 +61,6 @@ apt-get purge -y -qq \ apt-get autoremove -y -echo >&2 "===]> Info: Reconfigure environment ... " - -locale-gen --purge en_US.UTF-8 en_US -printf 'LANG="C.UTF-8"\nLANGUAGE="C.UTF-8"\n' >/etc/default/locale - -dpkg-reconfigure -f readline resolvconf - -cat </etc/NetworkManager/NetworkManager.conf -[main] -plugins=ifupdown,keyfile - -[ifupdown] -managed=false - -[device] -wifi.scan-rand-mac-address=no -EOF -dpkg-reconfigure network-manager - -echo >&2 "===]> Info: Configure Network Manager to use iwd... " -mkdir -p /etc/NetworkManager/conf.d -printf '#[device]\n#wifi.backend=iwd\n' > /etc/NetworkManager/conf.d/wifi_backend.conf -#systemctl enable iwd.service - echo >&2 "===]> Info: Cleanup the chroot environment... " truncate -s 0 /etc/machine-id diff --git a/files/grub/grub.cfg b/files/grub/grub.cfg index 6b8b115..025eb45 100644 --- a/files/grub/grub.cfg +++ b/files/grub/grub.cfg @@ -6,27 +6,27 @@ insmod all_video set default="0" set timeout=30 -menuentry "Try Ubuntu Jammy Jellyfish without installing" { +menuentry "Try Linux Mint Virginia without installing" { linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro pcie_ports=native intel_iommu=on iommu=pt --- initrd /casper/initrd } -menuentry "Try Ubuntu Jammy Jellyfish without installing (Safe Graphics)" { +menuentry "Try Linux Mint Virginia without installing (Safe Graphics)" { linux /casper/vmlinuz file=/cdrom/preseed/mbp164.seed boot=casper ro nomodeset pcie_ports=native intel_iommu=on iommu=pt --- initrd /casper/initrd } -menuentry "Try Ubuntu Jammy Jellyfish without installing (NVMe blacklisted)" { +menuentry "Try Linux Mint Virginia without installing (NVMe blacklisted)" { linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro pcie_ports=native intel_iommu=on iommu=pt modprobe.blacklist=nvme --- initrd /casper/initrd } -menuentry "Install Ubuntu Jammy Jellyfish" { +menuentry "Install Linux Mint Virginia" { linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp.seed boot=casper only-ubiquity pcie_ports=native intel_iommu=on iommu=pt --- initrd /casper/initrd } -menuentry "Install Ubuntu Jammy Jellyfish (Safe Graphics)" { +menuentry "Install Linux Mint Virginia (Safe Graphics)" { linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp164.seed boot=casper only-ubiquity nomodeset pcie_ports=native intel_iommu=on iommu=pt --- initrd /casper/initrd } -menuentry "Install Ubuntu Jammy Jellyfish (NVMe blacklisted)" { +menuentry "Install Linux Mint Virginia (NVMe blacklisted)" { linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp.seed boot=casper only-ubiquity pcie_ports=native intel_iommu=on iommu=pt modprobe.blacklist=nvme --- initrd /casper/initrd }