Skip to content

Commit 719f7e3

Browse files
Merge branch 'main' of https://github.com/endeavouros-team/EndeavourOS-ISO into endeavour
2 parents b81b7f5 + a290732 commit 719f7e3

6 files changed

Lines changed: 12 additions & 7 deletions

File tree

airootfs/etc/motd

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,18 @@ Live environment will start now and let you install EndeavourOS to disk, or tryo
1818

1919
Although EndeavourOS team will respond and forward T2 specific issues, if you know that it's T2 specific issue, just report it directly to us.
2020

21+
Bugs with the installation can be reported here:
22+
https://discord.com/invite/68MRhQu (T2Linux)
23+
https://forum.endeavouros.com/c/general-system/endeavouros-installation (EndeavourOS upstream)
24+
2125
Bugs can be reported here:
2226
https://discord.com/invite/68MRhQu (T2Linux)
2327
https://forum.endeavouros.com/c/Arch-based-related-questions/bug-reports (EndeavourOS upstream)
2428

2529
Getting help at Discord (T2Linux): https://discord.com/invite/68MRhQu
2630
Getting help at the forum (upstream): https://forum.endeavouros.com
2731
Help-Chat is available on telegram (upstream): https://t.me/Endeavouros/
28-
Upstream news at Twitter: https://twitter.com/OsEndeavour
32+
Upstream news at Twitter (upstream): https://twitter.com/OsEndeavour
2933

3034
Our journey wouldn't be made possible without the generosity of our open collective community:
3135
https://github.com/sponsors/NoaHimeska1873

mirrorlist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
## Germany & United States
88

9-
Server = http://mirror.f4st.host/archlinux/$repo/os/$arch
10-
Server = https://mirror.f4st.host/archlinux/$repo/os/$arch
9+
Server = http://mirror.moson.org/arch/$repo/os/$arch
10+
Server = https://mirror.moson.org/arch/$repo/os/$arch
1111

1212
Server = http://arch.mirror.constant.com/$repo/os/$arch
1313
Server = https://arch.mirror.constant.com/$repo/os/$arch

packages.x86_64

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ syslinux
189189
## Live iso tools
190190
clonezilla
191191
efitools
192+
fsarchiver
192193
gpart
193194
gparted
194195
grsync

profiledef.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# shellcheck disable=SC2034
33

44
iso_name="EndeavourOS-T2"
5-
iso_label="EOS_T2_GEMINI"
5+
iso_label="EOS_T2_ENDEAVOUR"
66
iso_publisher="t2linux <https://t2linux.org>"
77
iso_application="EndeavourOS Live/Rescue CD for Macs with T2 security chip"
88
iso_version="Gemini-T2"

run_before_squashfs.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ mv "/usr/lib/modules-load.d/nvidia-utils.conf" "/etc/calamares/files/nv-modules-
9191
# Get extra drivers
9292
mkdir "/opt/extra-drivers"
9393
pacman -Syy
94-
pacman -Sw --noconfirm --cachedir "/opt/extra-drivers" r8168
94+
# pacman -Sw --noconfirm --cachedir "/opt/extra-drivers" r8168
9595
9696
# get needed packages for offline installs
9797
mkdir -p "/usr/share/packages"
@@ -109,7 +109,7 @@ pacman -Qs | grep "/firefox " | cut -c7- >> iso_package_versions
109109
pacman -Qs | grep "/linux " | cut -c7- >> iso_package_versions
110110
pacman -Qs | grep "/mesa " | cut -c7- >> iso_package_versions
111111
pacman -Qs | grep "/xorg-server " | cut -c7- >> iso_package_versions
112-
pacman -Qs | grep "/nvidia-dkms " | cut -c7- >> iso_package_versions
112+
pacman -Qs | grep "/nvidia " | cut -c7- >> iso_package_versions
113113
mv "iso_package_versions" "/home/liveuser/"
114114
115115
echo "############################"

syslinux/archiso_sys-linux.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ENDTEXT
1717
MENU LABEL EndeavourOS NVIDIA (latest cards, x86_64, BIOS)
1818
LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
1919
INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
20-
APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% cow_spacesize=10G copytoram=n nvidia nvidia-drm.modeset=1 nouveau.modeset=0 module_blacklist=nouveau,pcspkr i915.modeset=1 radeon.modeset=1 nvme_load=yes
20+
APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% cow_spacesize=10G copytoram=n nvidia nvidia_drm.modeset=1 nouveau.modeset=0 module_blacklist=nouveau,pcspkr i915.modeset=1 radeon.modeset=1 nvme_load=yes
2121

2222
# Fallback (nomodeset)
2323
LABEL eos64fb

0 commit comments

Comments
 (0)