Move libgl1-mesa-dri into minimal 3d accel list.

diff --git a/ansible/config_new.yml b/ansible/config_new.yml
index 8153fc9199e206f4e870386070a1b6329e88529d..9f08e21bbf3dd42b1bd0535ab3bade1efa1ab8ce 100644 (file)
--- 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 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/ *#.*$//'
     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
   #  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 fe8a7a3628ba8654efb4f8a6aed06f9f5e886425..1b7e69655c563d2c12d8c160a2769b3dfe1a862b 100644 (file)
--- a/ansible/files/apt-mark_new/W530/3d_acceleration
+++ b/ansible/files/apt-mark_new/W530/3d_acceleration
@@ -1,4 +1,3 @@
 bumblebee-nvidia
 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
 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 9d025bb81a3e42177114422f8f8b019ec8c8da04..aa318bddd1f5a8a95e00d25574be2b0161ab80fb 100644 (file)
--- 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
 libglu1-mesa  # tested as necessary for OpenGL 3D acceleration to work

+libgl1-mesa-dri  # tested as necessary for OpenGL 3D acceleration to work