From a8f7db0689ec5e46da73d4239c0db13ace2c0b0f Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Tue, 17 Jul 2018 13:22:07 -0400 Subject: [PATCH] profile: remove modesetting (no longer optional) and add i915 --- profiles/pentoo/arch/x86-common/make.defaults | 2 +- scripts/pentoo-updater.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/profiles/pentoo/arch/x86-common/make.defaults b/profiles/pentoo/arch/x86-common/make.defaults index e1fcb67d7..d85724074 100644 --- a/profiles/pentoo/arch/x86-common/make.defaults +++ b/profiles/pentoo/arch/x86-common/make.defaults @@ -1 +1 @@ -VIDEO_CARDS="modesetting nvidia amdgpu nouveau fbdev glint intel i965 mach64 mga nv radeon radeonsi radeonhd savage sis tdfx vga via vmware voodoo apm chips cirrus cyrix epson i128 i740 imstt nsc rendition s3 s3virge siliconmotion" +VIDEO_CARDS="nvidia amdgpu nouveau fbdev glint intel i915 i965 mach64 mga nv radeon radeonsi radeonhd savage sis tdfx vga via vmware voodoo apm chips cirrus cyrix epson i128 i740 imstt nsc rendition s3 s3virge siliconmotion" diff --git a/scripts/pentoo-updater.sh b/scripts/pentoo-updater.sh index e9fc01857..72e415f1c 100755 --- a/scripts/pentoo-updater.sh +++ b/scripts/pentoo-updater.sh @@ -6,7 +6,7 @@ if [ -n "${clst_target}" ]; then #we are in catalyst mkdir -p /var/log/portage/emerge-info/ emerge --info > /var/log/portage/emerge-info/emerge-info-$(date "+%Y%m%d").txt else #we are on a user system - if [ -x /usr/bin/layman ]; then + if [ -d /var/db/repos/pentoo ] && [ -x /usr/bin/layman ]; then if /usr/bin/layman -l | grep pentoo; then printf "Pentoo now manages it's overlay through portage instead of layman.\n" printf "Removing Pentoo overlay from layman...\n"