Archives/manjaro-architect
2
0
Fork 0
mirror of https://gitlab.manjaro.org/applications/manjaro-architect synced 2024-11-06 03:20:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Chrysostomus/manjaro-architect

Browse Source
This commit is contained in:
Bernhard Landauer 2017-03-13 01:30:29 +01:00
commit 201d5f1b8c
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/util-base.sh
View File

@ -231,9 +231,9 @@ install_base() {
# Create the base list of packages
echo "" > /mnt/.base
# Choose kernel and possibly base-devel
DIALOG " $_InstBseTitle " --checklist "$_InstStandBseBody$_UseSpaceBar" 0 0 12 \
$(cat /tmp/.available_kernels |awk '$0=$0" - off"') \
"base-devel" "-" off 2>${PACKAGES} || return 0
DIALOG " $_InstBseTitle " --checklist "$_InstStandBseBody$_UseSpaceBar" 0 0 13 \
"base-devel" "-" off \
$(cat /tmp/.available_kernels |awk '$0=$0" - off"') 2>${PACKAGES} || return 0
cat ${PACKAGES} | tr ' ' '\n' >> /mnt/.base
if [[ $(cat ${PACKAGES}) == "" ]]; then

7
lib/util-desktop.sh
View File

@ -11,7 +11,7 @@
# or modify it as you wish.
setup_graphics_card() {
DIALOG " $_InstGrDrv " --radiolist "\n$_UseSpaceBar" 0 0 12 \
DIALOG " $_GCDetBody " --radiolist "\n$_UseSpaceBar" 0 0 12 \
$(mhwd -l | awk '/video-/{print $1}' |awk '$0=$0" - off"') 2> /tmp/.driver || return 0
if [[ $(cat /tmp/.driver) != "" ]]; then
@ -60,6 +60,8 @@ install_network_drivers() {
arch_chroot "mhwd -f -i pci ${driver}" 2>$ERR
check_for_error "install ${driver}" $?
done
else
echo "No special network drivers installed because no need detected."
fi
}
@ -168,7 +170,7 @@ install_manjaro_de_wm() {
fi
# Enable services in the chosen profile
enable_services
install_graphics_menu
# Stop for a moment so user can see if there were errors
echo ""
echo ""
@ -178,7 +180,6 @@ install_manjaro_de_wm() {
# Clear the packages file for installation of "common" packages
echo "" > ${PACKAGES}
install_graphics_menu
# Offer to install various "common" packages.
install_extra