Merge branch 'bionic' of https://github.com/yavdr/yavdr-ansible into bionic

roles/autoinstall-firmware/tasks/main.yml

@@ -2,16 +2,32 @@
 
 # This role provides easyily downloadable firmware files
 
-- name: Firmware for Hauppauge WinTV HD Solo/Duo, PCTV 292e
+- name: Firmware dvb-demod-si2168-b40-01.fw for Hauppauge WinTV HD Solo/Duo, PCTV 292e
   get_url:
     url: https://github.com/OpenELEC/dvb-firmware/raw/master/firmware/dvb-demod-si2168-b40-01.fw
     checksum: sha256:8507536630d75a316d0719d6b95c04b90c36baa5b457ad457c9bacadafcef134
     dest: /lib/firmware/dvb-demod-si2168-b40-01.fw
   when: '"2040:0264" in usb or "2013:025f" in usb'
 
-- name: Firmware for Hauppauge WinTV-HVR-930C
+- name: Firmware dvb-fe-xc5000-1.6.114.fw for Hauppauge WinTV-HVR-930C
   get_url:
     url: https://github.com/OpenELEC/dvb-firmware/raw/master/firmware/dvb-fe-xc5000-1.6.114.fw
     checksum: sha256:7104bda8df301fe1bd4c09de1708aeb6d0d8e1f9d55505449fecfad82639235f
     dest: /lib/firmware/dvb-fe-xc5000-1.6.114.fw
   when: '"2040:1605" in usb'
+
+- name: Firmware ngenge_18.fw for ngene cards
+  get_url:
+    url: http://l4m-daten.de/downloads/firmware/dvb-s2/linux/all/ngene_18.fw
+    checksum: sha256:213d98ec2cd575eba15d82ee79fed7098e670de43792f8aa773a95cfb7c32060
+    dest: /lib/firmware/ngene_18.fw
+  when: '"ngene" in modules'
+  notify: reboot required
+
+- name: Firmware drxk_a3.mc for drxk
+  get_url:
+     url: https://github.com/OpenELEC/dvb-firmware/raw/master/firmware/drxk_a3.mc
+     checksum: sha256:f8956ad6f92a4ce90a6ab94ed23e2f9a27e9317e936fd3e0119778dd28e7e294
+     dest: /lib/firmware/drxk_a3.mc
+  when: '"ngene" in modules or "drxk" in modules'
+  notify: reboot required

roles/autoinstall-virtualbox-guest/tasks/main.yml

@@ -36,5 +36,5 @@
         - vdrctl enable xineliboutput
       ignore_errors: yes
   when:
-    - ansible_virtualization_type == "virtualbox"
+    - ansible_virtualization_type == "virtualbox" or ansible_virtualization_type == "VMware"
     - ansible_virtualization_role == "guest"

roles/collect-facts/tasks/main.yml

@@ -22,6 +22,15 @@
     - amd_detected
     - virtualbox_detected
 
+- name: get detailed PCI device information
+  pci_facts:
+  tags:
+    - always
+
+- debug:
+    var: pci_devices
+    verbosity: 1
+
 - name: known vdr output plugins
   set_fact:
     vdr_output_plugins:    

roles/dvd/tasks/main.yml

@@ -29,3 +29,4 @@
   shell: sed 's/--lock-media //' /lib/udev/rules.d/60-cdrom_id.rules > /etc/udev/rules.d/60-cdrom_id.rules
   args:
     creates: /etc/udev/rules.d/60-cdrom_id.rules
+    warn: false

roles/kodi/tasks/install-kodi.yml

@@ -8,4 +8,18 @@
   with_items:
     - kodi
     - kodi-pvr-vdr-vnsi
-    - kodi-eventclients-kodi-send # for ubuntu packages, team-xbmc uses "kodi-eventclients-xbmc-send for some reason
+
+- name: apt | install kodi-send (team-xbmc PPA)
+  apt:
+    name: "kodi-eventclients-xbmc-send" # team-xbmc uses "kodi-eventclients-xbmc-send for some reason
+    state: present
+    install_recommends: no
+  register: team_xbmc_ppa
+  ignore_errors: True
+
+- name: apt | install kodi-send (Ubuntu package)
+  apt:
+    name: "kodi-eventclients-kodi-send" # fallback to ubuntu package
+    state: present
+    install_recommends: no
+  when: team_xbmc_ppa.failed

roles/kodi/templates/kodi.service.j2

@@ -8,5 +8,5 @@ ExecStartPre=-/usr/bin/set-kodi-display
 ExecStart=/usr/bin/kodi -l /run/lirc/lircd
 ExecStop=/bin/bash -c "/usr/bin/kodi-send --action=QUIT; while ps -p $MAINPID -o comm=; do sleep .25; done"
 TimeoutStopSec=10
-SuccessExitStatus=0 127
+SuccessExitStatus=0 127 SIGKILL
 Restart=on-failure

roles/yavdr-common/tasks/configure_system.yml

@@ -1,18 +1,7 @@
-- name: apt | ensure debconf and debconf-utils are installed
-  apt:
-    name: "{{ packages }}"
-  vars:
-    packages:
-    - debconf
-    - debconf-utils
-
-- name: use bash instead of dash by default
-  debconf:
-    name: dash
-    question: dash/sh
-    value: 'false'
-    vtype: select
-  notify: ['Reconfigure unattended upgrades with dpkg']
+- name: use bash instead of dash
+  shell: |
+    echo "set dash/sh false" | debconf-communicate
+    dpkg-reconfigure -f noninteractive dash
 - name: create vdr group
   group:
     gid: '{{ vdr.gid }}'