summaryrefslogtreecommitdiffstats
path: root/roles/common/templates/etc/apt
diff options
context:
space:
mode:
authorGuilhem Moulin <guilhem@fripost.org>2015-07-12 13:27:30 +0200
committerGuilhem Moulin <guilhem@fripost.org>2015-07-12 13:27:30 +0200
commite3a42987d9929236b7b68352bbd4bd7c6cde8d38 (patch)
tree9d22b542aec62db32e9c076eb69cc1b5b2655bcb /roles/common/templates/etc/apt
parentb752a80935941eb07e7700d8cbab567d1a3f39c4 (diff)
Change match to "^(Genuine)?Intel.*" for Intel processors.
Diffstat (limited to 'roles/common/templates/etc/apt')
-rw-r--r--roles/common/templates/etc/apt/preferences.j22
-rw-r--r--roles/common/templates/etc/apt/sources.list.j24
2 files changed, 3 insertions, 3 deletions
diff --git a/roles/common/templates/etc/apt/preferences.j2 b/roles/common/templates/etc/apt/preferences.j2
index 7774cba..ba10834 100644
--- a/roles/common/templates/etc/apt/preferences.j2
+++ b/roles/common/templates/etc/apt/preferences.j2
@@ -19,7 +19,7 @@ Package: firmware-linux-nonfree
Pin-Priority: 200
{% endif %}
-{% if ansible_processor[0] | search('^Intel.*') and
+{% if ansible_processor[0] | search('^(Genuine)?Intel.*') and
not (ansible_virtualization_role == 'guest' and ansible_virtualization_type == 'xen') -%}
# Automatically upgrade the microcode (when manually installed)
Package: intel-microcode iucode-tool
diff --git a/roles/common/templates/etc/apt/sources.list.j2 b/roles/common/templates/etc/apt/sources.list.j2
index ee4f20d..5788ade 100644
--- a/roles/common/templates/etc/apt/sources.list.j2
+++ b/roles/common/templates/etc/apt/sources.list.j2
@@ -2,9 +2,9 @@
# Do NOT edit this file directly!
# vim: set filetype=debsources :
-deb http://ftp.se.debian.org/debian/ {{ ansible_lsb.codename }} main{% if 'non-free' in group_names or (ansible_processor[0] | search("^Intel.*") and not (ansible_virtualization_role == 'guest' and ansible_virtualization_type == 'xen')) %} contrib non-free{% endif %}
+deb http://ftp.se.debian.org/debian/ {{ ansible_lsb.codename }} main{% if 'non-free' in group_names or (ansible_processor[0] | search("^(Genuine)?Intel.*") and not (ansible_virtualization_role == 'guest' and ansible_virtualization_type == 'xen')) %} contrib non-free{% endif %}
-deb http://security.debian.org/ {{ ansible_lsb.codename }}/updates main{% if 'non-free' in group_names or (ansible_processor[0] | search("^Intel.*") and not (ansible_virtualization_role == 'guest' and ansible_virtualization_type == 'xen')) %} contrib non-free{% endif %}
+deb http://security.debian.org/ {{ ansible_lsb.codename }}/updates main{% if 'non-free' in group_names or (ansible_processor[0] | search("^(Genuine)?Intel.*") and not (ansible_virtualization_role == 'guest' and ansible_virtualization_type == 'xen')) %} contrib non-free{% endif %}
deb http://ftp.se.debian.org/debian/ {{ ansible_lsb.codename }}-updates main