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

Don't remove stock kernel, minor tweaks

Browse Source
This commit is contained in:
natemaia 2019-10-17 02:47:06 -07:00
parent 266abc3347
commit 5c0ea2c6a3
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
archlabs-installer
View File

@ -1198,7 +1198,7 @@ install_main()
login "${EDIT_FILES[login]}" login "${EDIT_FILES[login]}"
if [[ -z $choice || $choice == 'finished' ]]; then if [[ -z $choice || $choice == 'finished' ]]; then
[[ $DEBUG == true && -r $DBG ]] && $EDITOR $DBG [[ $DEBUG == true && -r $DBG ]] && ${EDITOR:-vim} $DBG
clear && die 127 clear && die 127
else else
local exists='' local exists=''
@ -1206,7 +1206,7 @@ install_main()
[[ -e ${MNT}$f ]] && exists+=" ${MNT}$f" [[ -e ${MNT}$f ]] && exists+=" ${MNT}$f"
done done
if [[ $exists ]]; then if [[ $exists ]]; then
$EDITOR -O $exists ${EDITOR:-vim} -O $exists
else else
msg "File Missing" "\nThe file(s) selected do not exist:\n\n${EDIT_FILES[$choice]}\n" msg "File Missing" "\nThe file(s) selected do not exist:\n\n${EDIT_FILES[$choice]}\n"
fi fi
@ -1244,7 +1244,7 @@ install_base()
EOF EOF
fi fi
[[ -e /run/archiso/sfs/airootfs && $KERNEL == 'linux' ]] && cp -vf $RUN/x86_64/vmlinuz $MNT/boot/vmlinuz-linux [[ -e /run/archiso/sfs/airootfs ]] && cp -vf $RUN/x86_64/vmlinuz $MNT/boot/vmlinuz-linux
[[ -d /etc/netctl ]] && cp -rfv /etc/netctl $MNT/etc/ [[ -d /etc/netctl ]] && cp -rfv /etc/netctl $MNT/etc/
[[ -f /etc/resolv.conf ]] && cp -fv /etc/resolv.conf $MNT/etc/ [[ -f /etc/resolv.conf ]] && cp -fv /etc/resolv.conf $MNT/etc/
[[ -e /etc/NetworkManager/system-connections ]] && cp -rvf /etc/NetworkManager/system-connections $MNT/etc/NetworkManager/ [[ -e /etc/NetworkManager/system-connections ]] && cp -rvf /etc/NetworkManager/system-connections $MNT/etc/NetworkManager/
@ -1427,8 +1427,6 @@ install_packages()
rmpkg+="zsh " rmpkg+="zsh "
fi fi
[[ $KERNEL != 'linux' ]] && rmpkg+='linux '
if [[ $INSTALL_WMS == 'dwm' ]]; then # dwm only needs a very limited package set if [[ $INSTALL_WMS == 'dwm' ]]; then # dwm only needs a very limited package set
inpkg+="nitrogen polkit-gnome gnome-keyring dunst " inpkg+="nitrogen polkit-gnome gnome-keyring dunst "
else else