mirror of
https://github.com/t2linux/EndeavourOS-ISO-t2.git
synced 2026-08-16 05:18:06 -07:00
Merge upstream archiso changes, bootmode makeover (upstream) adding firefox.desktop file for livesession to let it start without showing affiliate links from firefox, exchanging maliit-keyboard with plasma-keyboard
This commit is contained in:
+2
-1
@@ -2,8 +2,9 @@
|
||||
|
||||
|
||||
---
|
||||
# Post Mercury changes (2025)
|
||||
# Ganymede Release Changes (2025)
|
||||
* adding nvidia.service and script to install Nvidia Modules packages open or closed source related to Model ranges.
|
||||
* Broadcom-WL handling is now using a service too, and it will popup request to change driver on the livesession asking user to proceed.
|
||||
* updating mkarchiso to latest and merging changes to bootloader entry format from upstream.
|
||||
* changing boot entries to as of no need to blacklist Nvidia (as not installed on boot)
|
||||
* updating preview pictures in liveuser skel settings to show properly on live session.
|
||||
|
||||
@@ -1,3 +1 @@
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
EndeavourOS
|
||||
|
||||
@@ -1,4 +1 @@
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
LANG=en_US.UTF-8
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
MODULES=(vmd)
|
||||
HOOKS=(base udev modconf kms memdisk archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs block filesystems keyboard)
|
||||
COMPRESSION="zstd"
|
||||
@@ -1,11 +1,8 @@
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
# mkinitcpio preset file for the 'linux' package on archiso
|
||||
|
||||
PRESETS=('archiso')
|
||||
|
||||
ALL_kver='/boot/vmlinuz-linux'
|
||||
ALL_config='/etc/mkinitcpio.conf'
|
||||
archiso_config='/etc/mkinitcpio.conf.d/archiso.conf'
|
||||
|
||||
archiso_image="/boot/initramfs-linux.img"
|
||||
|
||||
@@ -1,5 +1,2 @@
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
[Journal]
|
||||
Storage=volatile
|
||||
|
||||
@@ -1,6 +1,3 @@
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
[Login]
|
||||
HandleSuspendKey=ignore
|
||||
HandleHibernateKey=ignore
|
||||
|
||||
@@ -1,6 +1,3 @@
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
[Service]
|
||||
ExecStart=
|
||||
ExecStart=-/sbin/agetty --autologin liveuser --noclear %I 38400 linux
|
||||
|
||||
@@ -1,22 +1,29 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
script_cmdline ()
|
||||
{
|
||||
script_cmdline() {
|
||||
local param
|
||||
for param in $(< /proc/cmdline); do
|
||||
for param in $(</proc/cmdline); do
|
||||
case "${param}" in
|
||||
script=*) echo "${param#*=}" ; return 0 ;;
|
||||
script=*)
|
||||
echo "${param#*=}"
|
||||
return 0
|
||||
;;
|
||||
esac
|
||||
done
|
||||
}
|
||||
|
||||
automated_script ()
|
||||
{
|
||||
automated_script() {
|
||||
local script rt
|
||||
script="$(script_cmdline)"
|
||||
if [[ -n "${script}" && ! -x /tmp/startup_script ]]; then
|
||||
if [[ "${script}" =~ ^((http|https|ftp)://) ]]; then
|
||||
curl "${script}" --retry-connrefused -s -o /tmp/startup_script >/dev/null
|
||||
if [[ "${script}" =~ ^((http|https|ftp|tftp)://) ]]; then
|
||||
# there's no synchronization for network availability before executing this script
|
||||
printf '%s: waiting for network-online.target\n' "$0"
|
||||
until systemctl --quiet is-active network-online.target; do
|
||||
sleep 1
|
||||
done
|
||||
printf '%s: downloading %s\n' "$0" "${script}"
|
||||
curl "${script}" --location --retry-connrefused --retry 10 --fail -s -o /tmp/startup_script
|
||||
rt=$?
|
||||
else
|
||||
cp "${script}" /tmp/startup_script
|
||||
@@ -24,6 +31,9 @@ automated_script ()
|
||||
fi
|
||||
if [[ ${rt} -eq 0 ]]; then
|
||||
chmod +x /tmp/startup_script
|
||||
printf '%s: executing automated script\n' "$0"
|
||||
# note that script is executed when other services (like pacman-init) may be still in progress, please
|
||||
# synchronize to "systemctl is-system-running --wait" when your script depends on other services
|
||||
/tmp/startup_script
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# fix for screen readers
|
||||
if grep -Fq 'accessibility=' /proc/cmdline &> /dev/null; then
|
||||
if grep -Fqa 'accessibility=' /proc/cmdline &> /dev/null; then
|
||||
setopt SINGLE_LINE_ZLE
|
||||
fi
|
||||
|
||||
|
||||
+902
File diff suppressed because it is too large
Load Diff
@@ -1,3 +1,10 @@
|
||||
change on 2025.11.09:
|
||||
remerge changes [bootmode changes, some config changed (updated), adds support for IA32-UEFI boots (forcingly)]
|
||||
```
|
||||
Version archiso 87-1
|
||||
```
|
||||
|
||||
|
||||
change on 2025.09.15:
|
||||
remerge changes, no code changes
|
||||
```
|
||||
|
||||
@@ -233,6 +233,7 @@ plasma-browser-integration
|
||||
plasma-desktop
|
||||
plasma-disks
|
||||
plasma-firewall
|
||||
plasma-keyboard
|
||||
plasma-nm
|
||||
plasma-pa
|
||||
plasma-x11-session
|
||||
|
||||
+1
-2
@@ -11,8 +11,7 @@ buildmodes=('iso')
|
||||
quiet="n"
|
||||
work_dir="work"
|
||||
out_dir="out"
|
||||
bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' 'uefi-x64.systemd-boot.esp' 'uefi-x64.systemd-boot.eltorito')
|
||||
|
||||
bootmodes=('bios.syslinux' 'uefi.systemd-boot')
|
||||
arch="x86_64"
|
||||
pacman_conf="pacman.conf"
|
||||
airootfs_image_type="squashfs"
|
||||
|
||||
Reference in New Issue
Block a user