From 55f8b4ab99cc455a88b8e05008ae2358605522fd Mon Sep 17 00:00:00 2001 From: Tommy Date: Wed, 5 Jun 2024 19:01:48 -0700 Subject: [PATCH] Fix rosetta support --- Ubuntu--24.04-Desktop.sh | 5 +- etc/apt/rosetta-sources.list | 63 -------------------------- etc/apt/sources.list.d/rosetta.sources | 27 +++++++++++ 3 files changed, 30 insertions(+), 65 deletions(-) delete mode 100644 etc/apt/rosetta-sources.list create mode 100644 etc/apt/sources.list.d/rosetta.sources diff --git a/Ubuntu--24.04-Desktop.sh b/Ubuntu--24.04-Desktop.sh index 0902dc8..16578f7 100644 --- a/Ubuntu--24.04-Desktop.sh +++ b/Ubuntu--24.04-Desktop.sh @@ -156,14 +156,15 @@ flatpak update -y # Rosetta setup if [ -f /media/psf/RosettaLinux/rosetta ] || [ -f /media/rosetta/rosetta ]; then + umask 022 if [ -f /media/rosetta/rosetta ]; then sudo /usr/sbin/update-binfmts --install rosetta /media/rosetta/rosetta --magic "\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x3e\x00" --mask "\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff" --credentials yes --preserve no --fix-binary yes fi - unpriv curl https://raw.githubusercontent.com/TommyTran732/Linux-Setup-Scripts/main/etc/apt/rosetta-sources.list | sudo tee /etc/apt/sources.list - rm -rf /etc/apt/sources.list.d/proposed.list + unpriv curl https://raw.githubusercontent.com/TommyTran732/Linux-Setup-Scripts/main/etc/apt/sources.list.d/rosetta.sources | sudo tee /etc/apt/sources.list.d/ubuntu.sources sudo dpkg --add-architecture amd64 sudo apt update sudo apt full-upgrade -y + umask 077 fi # Install Microsoft Edge if x86_64 diff --git a/etc/apt/rosetta-sources.list b/etc/apt/rosetta-sources.list deleted file mode 100644 index b54e594..0000000 --- a/etc/apt/rosetta-sources.list +++ /dev/null @@ -1,63 +0,0 @@ -# deb cdrom:[Ubuntu 22.04.3 LTS _mantic Jellyfish_ - Release arm64 (20240119)]/ mantic main restricted - -# See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to -# newer versions of the distribution. -deb [arch=arm64] http://us.ports.ubuntu.com/ubuntu-ports/ mantic main restricted -deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ mantic main restricted -# deb-src http://us.ports.ubuntu.com/ubuntu-ports/ mantic main restricted - -## Major bug fix updates produced after the final release of the -## distribution. -deb [arch=arm64] http://us.ports.ubuntu.com/ubuntu-ports/ mantic-updates main restricted -deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ mantic-updates main restricted -# deb-src http://us.ports.ubuntu.com/ubuntu-ports/ mantic-updates main restricted - -## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu -## team. Also, please note that software in universe WILL NOT receive any -## review or updates from the Ubuntu security team. -deb [arch=arm64] http://us.ports.ubuntu.com/ubuntu-ports/ mantic universe -deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ mantic universe -# deb-src http://us.ports.ubuntu.com/ubuntu-ports/ mantic universe -deb [arch=arm64] http://us.ports.ubuntu.com/ubuntu-ports/ mantic-updates universe -deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ mantic-updates universe -# deb-src http://us.ports.ubuntu.com/ubuntu-ports/ mantic-updates universe - -## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu -## team, and may not be under a free licence. Please satisfy yourself as to -## your rights to use the software. Also, please note that software in -## multiverse WILL NOT receive any review or updates from the Ubuntu -## security team. -deb [arch=arm64] http://us.ports.ubuntu.com/ubuntu-ports/ mantic multiverse -deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ mantic multiverse -# deb-src http://us.ports.ubuntu.com/ubuntu-ports/ mantic multiverse -deb [arch=arm64] http://us.ports.ubuntu.com/ubuntu-ports/ mantic-updates multiverse -deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ mantic-updates multiverse -# deb-src http://us.ports.ubuntu.com/ubuntu-ports/ mantic-updates multiverse - -## N.B. software from this repository may not have been tested as -## extensively as that contained in the main release, although it includes -## newer versions of some applications which may provide useful features. -## Also, please note that software in backports WILL NOT receive any review -## or updates from the Ubuntu security team. -deb [arch=arm64] http://us.ports.ubuntu.com/ubuntu-ports/ mantic-backports main restricted universe multiverse -deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ mantic-backports main restricted universe multiverse -# deb-src http://us.ports.ubuntu.com/ubuntu-ports/ mantic-backports main restricted universe multiverse - -deb [arch=arm64] http://us.ports.ubuntu.com/ubuntu-ports/ mantic-security main restricted -deb [arch=amd64] http://security.ubuntu.com/ubuntu/ mantic-security main restricted -# deb-src http://us.ports.ubuntu.com/ubuntu-ports mantic-security main restricted -deb [arch=arm64] http://us.ports.ubuntu.com/ubuntu-ports/ mantic-security universe -deb [arch=amd64] http://security.ubuntu.com/ubuntu/ mantic-security universe -# deb-src http://us.ports.ubuntu.com/ubuntu-ports mantic-security universe -deb [arch=arm64] http://us.ports.ubuntu.com/ubuntu-ports/ mantic-security multiverse -deb [arch=amd64] http://security.ubuntu.com/ubuntu/ mantic-security multiverse -# deb-src http://us.ports.ubuntu.com/ubuntu-ports mantic-security multiverse - -deb [arch=arm64] http://us.ports.ubuntu.com/ubuntu-ports/ mantic-proposed main restricted -deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ mantic-proposed main restricted - -# This system was installed using small removable media -# (e.g. netinst, live or single CD). The matching "deb cdrom" -# entries were disabled at the end of the installation process. -# For information about how to configure apt package sources, -# see the sources.list(5) manual. \ No newline at end of file diff --git a/etc/apt/sources.list.d/rosetta.sources b/etc/apt/sources.list.d/rosetta.sources new file mode 100644 index 0000000..481b745 --- /dev/null +++ b/etc/apt/sources.list.d/rosetta.sources @@ -0,0 +1,27 @@ +Types: deb +URIs: http://ports.ubuntu.com/ubuntu-ports/ +Suites: noble noble-updates noble-backports +Components: main restricted universe multiverse +Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg +Architectures: arm64 + +Types: deb +URIs: http://ports.ubuntu.com/ubuntu-ports/ +Suites: noble-security +Components: main restricted universe multiverse +Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg +Architectures: arm64 + +Types: deb +URIs: http://archive.ubuntu.com/ubuntu/ +Suites: noble noble-updates noble-backports +Components: main restricted universe multiverse +Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg +Architectures: amd64 + +Types: deb +URIs: http://archive.ubuntu.com/ubuntu/ +Suites: noble-security +Components: main restricted universe multiverse +Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg +Architectures: amd64 \ No newline at end of file