root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 03:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

change to correct nouveau usage on .32 and .34 kernel

Browse source
This commit is contained in:
Tobias Powalowski 2010-05-17 10:30:37 +02:00
parent dedea752c6
commit a46e28e424
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
usr/share/archboot/installer/setup
View file

@ -2068,13 +2068,10 @@ select_packages() {
PACKAGES="$(cat $ANSWER)"
fi
# Add packages which are not in core repository
if [ "$(grep -w nvidia-kms /proc/cmdline)" ]; then
if ! [ "$(grep -w nouveau-drm $PACKAGES)" ]; then
[ "$VMLINUZ" = "kernel26" ] && PACKAGES="$PACKAGES nouveau-drm"
[ "$VMLINUZ" = "kernel26-lts" ] && PACKAGES="$PACKAGES nouveau-drm-lts"
if [ "$(grep -w nvidia-kms /proc/cmdline)" -a "$VMLINUZ" = "kernel26-lts" ]; then
! [ "$(grep -w nouveau-drm $PACKAGES)" ] && PACKAGES="$PACKAGES nouveau-drm-lts"
! [ "$(grep -w nouveau-firmware $PACKAGES)" ] && PACKAGES="$PACKAGES nouveau-firmware"
fi
fi
if [ "$(grep -w uvesafb /proc/cmdline)" ]; then
! [ "$(grep -w v86d $PACKAGES)" ] && PACKAGES="$PACKAGES v86d"
fi
@ -2549,12 +2546,14 @@ dogrub() {
FAIL_DM=""
GRUB_LEGACY="1"
USE_DMRAID=""
#checks for custom dev.map filesystem
if ! [ "$(dmraid -r | grep ^no )" ]; then
DIALOG --yesno "Setup detected dmraid device.\nDo you want to install grub on this device?" 0 0 && get_grub_dmraid_map
fi
if [ "$(ls /dev/vd[a-z] 2>/dev/null)" ]; then
DIALOG --yesno "Setup detected virtio devices.\nDo you want to install grub on this device?" 0 0 && get_grub_virtio_map
fi
# check on GUID (gpt)
if [ "$(parted -sl | grep "Partition Table: gpt")" ]; then
DIALOG --defaultno --yesno "Warning:\nSetup detected GUID (gpt) partition table.\n\nGrub doesn't support booting from GUID (gpt) partition table.\n\nDo you want to install grub to an other device, which contains a msdos partition table?" 0 0 || return 1