Archives/manjaro-architect
2
0
Fork 0
mirror of https://gitlab.manjaro.org/applications/manjaro-architect synced 2024-11-09 19:11:02 +00:00
Code Issues Projects Releases Wiki Activity

fix installed kernel logic; https://github.com/Chrysostomus/manjaro-architect/issues/115

Browse Source
This commit is contained in:
Bernhard Landauer 2017-03-14 12:04:41 +01:00
parent ddd06bc7ad
commit 96b91e4f7b
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/util-base.sh
View File

@ -239,19 +239,13 @@ install_base() {
if [[ $(cat ${PACKAGES}) == "" ]]; then if [[ $(cat ${PACKAGES}) == "" ]]; then
# Check to see if a kernel is already installed # Check to see if a kernel is already installed
ls ${MOUNTPOINT}/boot/*.img >/dev/null 2>&1 ls ${MOUNTPOINT}/boot/*.img >/dev/null 2>&1
if [[ $? == 0 ]]; then if [[ $? != 0 ]]; then
check_for_error "linux-$(ls ${MOUNTPOINT}/boot/*.img | cut -d'-' -f2) is already installed"
KERNEL="y"
else
for i in $(cat /tmp/.available_kernels); do
[[ $(cat ${PACKAGES} | grep ${i}) != "" ]] && KERNEL="y" && break;
done
fi
# If no kernel selected, warn and restart
if [[ $KERNEL == "n" ]]; then
DIALOG " $_ErrTitle " --msgbox "\n$_ErrNoKernel\n " 0 0 DIALOG " $_ErrTitle " --msgbox "\n$_ErrNoKernel\n " 0 0
check_for_error "no kernel installed." check_for_error "no kernel installed."
return 0 return 0
else
DIALOG " kernel check " --msgbox "\nlinux-$(ls ${MOUNTPOINT}/boot/*.img | cut -d'-' -f2) detected \n " 0 0
check_for_error "linux-$(ls ${MOUNTPOINT}/boot/*.img | cut -d'-' -f2) already installed"
fi fi
else else
check_for_error "selected: $(cat ${PACKAGES})" check_for_error "selected: $(cat ${PACKAGES})"