From cb92aa8edebf12ebc471abd0e2c32de1ec01cc41 Mon Sep 17 00:00:00 2001
From: Christian Heller <c.heller@plomlompom.de>
Date: Mon, 11 Sep 2017 23:49:50 +0200
Subject: [PATCH] Move libgl1-mesa-dri into minimal 3d accel list.

---
 ansible/config_new.yml                             | 4 ++--
 ansible/files/apt-mark_new/W530/3d_acceleration    | 1 -
 ansible/files/apt-mark_new/minimal/3d_acceleration | 1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ansible/config_new.yml b/ansible/config_new.yml
index 8153fc9..9f08e21 100644
--- a/ansible/config_new.yml
+++ b/ansible/config_new.yml
@@ -75,10 +75,10 @@
   - name: ensure minimal X window environment
     apt: name={{item}} state=present
     with_lines: cat ~/config/ansible/files/apt-mark_new/minimal/minimal_x | sed -e 's/ *#.*$//'
-  - name: ensure 3d acceleration core
+  - name: ensure 3d acceleration
     apt: name={{item}} state=present
     with_lines: cat ~/config/ansible/files/apt-mark_new/minimal/3d_acceleration | sed -e 's/ *#.*$//'
-  #- name: ensure further 3d acceleration and optimus switch
+  #- name: ensure optimus switch
   #  apt: name={{item}} state=present
   #  with_lines: cat ~/config/ansible/files/apt-mark_new/W530/3d_acceleration | sed -e 's/ *#.*$//'
   #- name: ensure user plom is in bumblebee group
diff --git a/ansible/files/apt-mark_new/W530/3d_acceleration b/ansible/files/apt-mark_new/W530/3d_acceleration
index fe8a7a3..1b7e696 100644
--- a/ansible/files/apt-mark_new/W530/3d_acceleration
+++ b/ansible/files/apt-mark_new/W530/3d_acceleration
@@ -1,4 +1,3 @@
 bumblebee-nvidia
-libgl1-mesa-dri  # tested as necessary for OpenGL 3D acceleration to work
 linux-headers-amd64  # tested as necessary to build proper nvidia-driver module
 primus  # bridge by which bumblebee will deliver Nvidia-renderend content to Intel card
diff --git a/ansible/files/apt-mark_new/minimal/3d_acceleration b/ansible/files/apt-mark_new/minimal/3d_acceleration
index 9d025bb..aa318bd 100644
--- a/ansible/files/apt-mark_new/minimal/3d_acceleration
+++ b/ansible/files/apt-mark_new/minimal/3d_acceleration
@@ -1 +1,2 @@
 libglu1-mesa  # tested as necessary for OpenGL 3D acceleration to work
+libgl1-mesa-dri  # tested as necessary for OpenGL 3D acceleration to work
-- 
2.30.2