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

Fix failing installation of vbox guest additions due to package changes

Browse Source
This commit is contained in:
natemaia 2020-05-03 20:56:06 -07:00
parent 27ca68f176
commit 1c1ee76cb4
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
archlabs-installer
View File

@ -7,7 +7,7 @@
# shellcheck disable=SC2086,SC2046,SC2254 # shellcheck disable=SC2086,SC2046,SC2254
VER=2.1.43 VER=2.1.44
# default values { # default values {
@ -278,7 +278,6 @@ declare -A FS_OPTS=(
declare -A LOGIN_PKGS=( declare -A LOGIN_PKGS=(
[gdm]='gdm' [gdm]='gdm'
[lightdm]='lightdm lightdm-gtk-greeter lightdm-gtk-greeter-settings accountsservice' [lightdm]='lightdm lightdm-gtk-greeter lightdm-gtk-greeter-settings accountsservice'
[ly]='archlabs-ly'
[sddm]='sddm' [sddm]='sddm'
[xinit]='xorg-xinit' [xinit]='xorg-xinit'
) # } ) # }
@ -470,7 +469,7 @@ select_login()
case $LOGIN_TYPE in case $LOGIN_TYPE in
gdm|sddm) gdm|sddm)
EDIT_FILES[login]="" EDIT_FILES[login]="none"
;; ;;
lightdm) lightdm)
LIGHTDM_GREETER='gtk-greeter' LIGHTDM_GREETER='gtk-greeter'
@ -478,7 +477,8 @@ select_login()
local txt="\nWith a deepin install you can choose to use their greeter for lightdm\n\nUse the deepin greeter?\n" local txt="\nWith a deepin install you can choose to use their greeter for lightdm\n\nUse the deepin greeter?\n"
[[ $INSTALL_WMS == *deepin* ]] && yesno "Greeter" "$txt" && LIGHTDM_GREETER="deepin-greeter" [[ $INSTALL_WMS == *deepin* ]] && yesno "Greeter" "$txt" && LIGHTDM_GREETER="deepin-greeter"
;; ;;
xinit) EDIT_FILES[login]="/home/$NEWUSER/.xinitrc /home/$NEWUSER/.xprofile" xinit)
EDIT_FILES[login]="/home/$NEWUSER/.xinitrc /home/$NEWUSER/.xprofile"
if (( $(wc -w <<< "$INSTALL_WMS") > 1 )); then if (( $(wc -w <<< "$INSTALL_WMS") > 1 )); then
dlg LOGIN_WM menu "Session" "$_login" $LOGIN_CHOICES || return 1 dlg LOGIN_WM menu "Session" "$_login" $LOGIN_CHOICES || return 1
LOGIN_WM="${WM_SESSIONS[$LOGIN_WM]}" LOGIN_WM="${WM_SESSIONS[$LOGIN_WM]}"
@ -1813,14 +1813,7 @@ install_packages()
fi fi
if [[ $VM == 'oracle' ]]; then if [[ $VM == 'oracle' ]]; then
case "$KERNEL" in chrun "pacman -S ${KERNEL}-headers virtualbox-guest-utils virtualbox-guest-dkms --needed --noconfirm"
linux)
chrun "pacman -S virtualbox-guest-utils virtualbox-guest-modules-arch --needed --noconfirm"
;;
*)
chrun "pacman -S ${KERNEL}-headers virtualbox-guest-utils virtualbox-guest-modules-dkms --needed --noconfirm"
;;
esac
fi fi
return 0 return 0