xstefen/al-installer
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove firmware packages causing issues

Browse Source
This commit is contained in:
natemaia 2022-09-29 19:29:06 -07:00
parent 044503041b
commit 41974531f9
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
installer
View File

@ -6,7 +6,7 @@
# AIF, Calamares, and the Arch Wiki.. Credit where credit is due # AIF, Calamares, and the Arch Wiki.. Credit where credit is due
# shellcheck disable=2086,2046,2254,2164,2030,2031,2001 # shellcheck disable=2086,2046,2254,2164,2030,2031,2001
VER=2.20 VER=2.22
# default values { # default values {
@ -105,7 +105,6 @@ typeset -a WM_PKGS=(
# packages installed to parity the .iso { # packages installed to parity the .iso {
typeset -a ISO_PKGS=( typeset -a ISO_PKGS=(
"arch-install-scripts"
"crda" "crda"
"ddrescue" "ddrescue"
"dhclient" "dhclient"
@ -121,8 +120,6 @@ typeset -a ISO_PKGS=(
"fsarchiver" "fsarchiver"
"hdparm" "hdparm"
"iputils" "iputils"
"ipw2100-fw"
"ipw2200-fw"
"lftp" "lftp"
"linux-firmware" "linux-firmware"
"linux-firmware-marvell" "linux-firmware-marvell"
@ -2063,8 +2060,8 @@ install_tearfree()
{ {
if [[ $VIRT != 'none' ]]; then if [[ $VIRT != 'none' ]]; then
[[ -e "$MNT/etc/X11/xorg.conf.d/40-touchpad.conf" ]] && rm -fv "$MNT/etc/X11/xorg.conf.d/40-touchpad.conf" [[ -e "$MNT/etc/X11/xorg.conf.d/40-touchpad.conf" ]] && rm -fv "$MNT/etc/X11/xorg.conf.d/40-touchpad.conf"
else elif [[ $TEARFREE ]]; then
if lspci | grep ' VGA ' | grep -q 'Intel'; then if lspci | grep ' VGA ' | grep -q 'Intel' && ! lspci | grep ' VGA ' | grep -qi 'NVIDIA'; then
echo "Creating Intel Tear Free config /etc/X11/xorg.conf.d/20-intel.conf" echo "Creating Intel Tear Free config /etc/X11/xorg.conf.d/20-intel.conf"
cat > "$MNT/etc/X11/xorg.conf.d/20-intel.conf" <<- EOF cat > "$MNT/etc/X11/xorg.conf.d/20-intel.conf" <<- EOF
Section "Device" Section "Device"
@ -2205,7 +2202,9 @@ config_console()
cat > "$AUTOLOGIN_SERV/autologin.conf" <<- EOF cat > "$AUTOLOGIN_SERV/autologin.conf" <<- EOF
[Service] [Service]
ExecStart= ExecStart=
ExecStart=-/sbin/agetty -o '-p -f -- \\\u' --noclear --autologin $NEWUSER - \$TERM ExecStart=-/sbin/agetty -o '-p -f -- \\\u' --noclear --autologin $NEWUSER %I \$TERM
Type=simple
Environment=XDG_SESSION_TYPE=x11
EOF EOF
else else
rm -rf "$AUTOLOGIN_SERV" rm -rf "$AUTOLOGIN_SERV"
@ -2221,7 +2220,7 @@ config_console()
echo \$PATH | grep -q "\$HOME/.local/bin:" || export PATH="\$HOME/.local/bin:\$PATH" echo \$PATH | grep -q "\$HOME/.local/bin:" || export PATH="\$HOME/.local/bin:\$PATH"
# automatically run startx when logging in on tty1 # automatically run startx when logging in on tty1
[ -z "\$DISPLAY" ] && [ \$XDG_VTNR -eq 1 ] && sleep 2 && startx [ -z "\$DISPLAY" ] && [ \$XDG_VTNR -eq 1 ] && startx
EOF EOF
else else
rm -rf "$MNT/home/$NEWUSER/.xinitrc" "$MNT/root/.xinitrc" rm -rf "$MNT/home/$NEWUSER/.xinitrc" "$MNT/root/.xinitrc"
@ -3536,7 +3535,7 @@ fi
trap 'printf "\n^C\n" && die 1' INT trap 'printf "\n^C\n" && die 1' INT
while getopts ":hcnrfDb:m:d:" OPT; do while getopts ":hcnrfDtb:m:d:" OPT; do
case "$OPT" in case "$OPT" in
D) debug ;; D) debug ;;
h) usage "${0##*/}" ;; h) usage "${0##*/}" ;;
@ -3545,6 +3544,7 @@ while getopts ":hcnrfDb:m:d:" OPT; do
d) DIST="$OPTARG" ;; d) DIST="$OPTARG" ;;
c) NONET=true ;; c) NONET=true ;;
f) NOFONT=true ;; f) NOFONT=true ;;
t) TEARFREE=true ;;
r) r)
if [[ ! -b $OPTARG ]]; then if [[ ! -b $OPTARG ]]; then
msg "Invalid Root" "\nThe installer expects a full path to a block device for root, e.g. /dev/sda2.\n\nExiting..\n" 2 msg "Invalid Root" "\nThe installer expects a full path to a block device for root, e.g. /dev/sda2.\n\nExiting..\n" 2