From 2d966364e59843b4ee52fda4d00124f840de7833 Mon Sep 17 00:00:00 2001 From: Alexander Grothe Date: Sun, 30 Sep 2018 10:17:20 +0200 Subject: [PATCH] Improve switching primary and secondary display --- Manual.html | 966 +++++++++--------- Manual.org | 22 +- roles/yavdr-desktop/tasks/main.yml | 9 + .../templates/bin/detect-second-display.j2 | 9 + .../user/detect-second-display.service.j2 | 2 +- 5 files changed, 535 insertions(+), 473 deletions(-) create mode 100644 roles/yavdr-desktop/templates/bin/detect-second-display.j2 diff --git a/Manual.html b/Manual.html index a2a3060..cf9c6ef 100644 --- a/Manual.html +++ b/Manual.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + Ansible Playbooks for yaVDR 0.7 @@ -240,262 +240,262 @@ for the JavaScript code in this tag.

Inhaltsverzeichnis

-
-

1 User Stories

+
+

1 User Stories

-
-

1.1 yavdr-full

+
+

1.1 yavdr-full

A User wants to install yaVDR without customization and relies on full automation. @@ -528,24 +528,24 @@ Several roles are used to tie everything together:

-
-

1.1.1 Using vdr, pulseaudio and xorg together

+
+

1.1.1 Using vdr, pulseaudio and xorg together

-
-

2 Introduction

+
+

2 Introduction

One of the major problems we faced with customized Ubuntu ISO files as installation media for prior yaVDR versions has been the limited hardware support and the time consuming process to create and update them. An interesting alternative to this approach is to enable the user to choose the installation medium by himself, so point releases, kernel versions and additional drivers can be chosen deliberately. After the basic setup is complete (and a working internet connection is available), a fully customizable install script completes the yaVDR installation.

-
-

3 Installing and configuring yaVDR with Ansible

+
+

3 Installing and configuring yaVDR with Ansible

This is an experimental feature which allows to set up a yaVDR installation based on a normal Ubuntu Server 16.04.x installation using Ansible. @@ -580,8 +580,8 @@ We use a callback to generate tags for all roles autmatically:

-
-

3.1 Install script for local usage

+
+

3.1 Install script for local usage

set -e
@@ -605,12 +605,12 @@ ansible-playbook yavdr07.yml -b -i 'localhost_inventory
-
-

4 Playbooks

+
+

4 Playbooks

-
-

4.1 yavdr07.yml

+
+

4.1 yavdr07.yml

The yavdr07.yml playbook sets up a fully-featured yaVDR installation: @@ -662,8 +662,8 @@ The yavdr07.yml playbook sets up a fully-featured yaVDR installatio

-
-

4.2 yavdr07-headless.yml

+
+

4.2 yavdr07-headless.yml

For a headless server installation yavdr07-headless.yml is a good choice @@ -701,8 +701,8 @@ For a headless server installation yavdr07-headless.yml is a good c

-
-

5 Hosts

+
+

5 Hosts

This playbook can either be used to run the installation on the localhost or any other PC in the network that can be accessed via ssh. Simply add the host names or IP addresses to the hosts file in the respective section: @@ -716,12 +716,12 @@ This playbook can either be used to run the installation on the localhost or any

-
-

6 Group Variables

+
+

6 Group Variables

-
-

6.1 PPAs

+
+

6.1 PPAs

---
@@ -739,8 +739,8 @@ This playbook can either be used to run the installation on the localhost or any
-
-

6.2 VDR user, directories, special configuration and plugins

+
+

6.2 VDR user, directories, special configuration and plugins

# properties of the user vdr and vdr-related options
@@ -766,8 +766,8 @@ This playbook can either be used to run the installation on the localhost or any
-
-

6.3 Media directories

+
+

6.3 Media directories

# dictionary of directories for (shared) files. Automatically exported via NFS and Samba if those roles are enabled
@@ -782,8 +782,8 @@ This playbook can either be used to run the installation on the localhost or any
-
-

6.4 NFS

+
+

6.4 NFS

nfs:
@@ -792,8 +792,8 @@ This playbook can either be used to run the installation on the localhost or any
-
-

6.5 Samba

+
+

6.5 Samba

samba:
@@ -803,8 +803,8 @@ This playbook can either be used to run the installation on the localhost or any
-
-

6.6 Additional packages

+
+

6.6 Additional packages

# additional packages you want to install
@@ -820,8 +820,8 @@ This playbook can either be used to run the installation on the localhost or any
-
-

6.7 System pre-configuration

+
+

6.7 System pre-configuration

frontend: vdr
@@ -836,20 +836,20 @@ This playbook can either be used to run the installation on the localhost or any
-
-

7 Roles

+
+

7 Roles

-
-

7.1 install-dependencies

+
+

7.1 install-dependencies

-
-

7.1.1 tasks

+
+

7.1.1 tasks

    -
  1. main.yml
    +
  2. main.yml
    ---
@@ -870,19 +870,19 @@ This playbook can either be used to run the installation on the localhost or any
    -
    -

    7.2 nvidia experimental drivers

    +
    +

    7.2 nvidia experimental drivers

    install nvidia-396 from ppa:graphics-drivers/ppa

    -
    -

    7.2.1 tasks

    +
    +

    7.2.1 tasks

      -
    1. main.yml
      +
    2. main.yml
      ---
@@ -912,15 +912,15 @@ install nvidia-396 from ppa:graphics-drivers/ppa
    -
    -

    7.3 yavdr-common

    +
    +

    7.3 yavdr-common

    This role is used to set up a basic yaVDR installation. It creates the directories, installs the vdr and other useful packages.

    -
    -

    7.3.1 default variables

    +
    +

    7.3.1 default variables

    This section is for reference only, please use the files in global_vars for customizations. @@ -933,7 +933,7 @@ This section is for reference only, please use the files in global_vars

      -
    1. Repositories
      +
    2. Repositories

      You can set a list of package repositories which provide the necessary packages. Feel free to use own PPAs if you need special customization to the VDR and it’s plugins. @@ -950,7 +950,7 @@ You can set a list of package repositories which provide the necessary packages.

    3. -
  3. Drivers
    +
  4. Drivers

    Automatically installed drivers can be very useful, but if you know you need a certain driver, you can simply set it’s value to true. If you don’t want a driver to be installed, set it’s value to false. @@ -963,7 +963,7 @@ Automatically installed drivers can be very useful, but if you know you need a c

-
  • Additional Packages
    +
  • Additional Packages

    Add additional packages you would like to have on your installation to this list @@ -977,7 +977,7 @@ Add additional packages you would like to have on your installation to this list

    • -
  • VDR
    +
  • VDR

    This section allows you to set the recording directory, the user and group that runs the vdr and it’s home directory. @@ -1010,15 +1010,15 @@ This section allows you to set the recording directory, the user and group that

    • -
    -

    7.3.2 tasks

    +
    +

    7.3.2 tasks

    yavdr-common executes the following tasks:

      -
    1. main.yml
      +
    2. main.yml
      ---
@@ -1035,7 +1035,7 @@ yavdr-common executes the following tasks:
        -
      1. Disable default installation of recommended packages
        +
      2. Disable default installation of recommended packages

        This task prevents apt to automatically install all recommended dependencies for packages: @@ -1052,7 +1052,7 @@ This task prevents apt to automatically install all recommended dependencies for

    -
  • Set up package repositories
    +
  • Set up package repositories
    - name: add PPAs
@@ -1072,7 +1072,7 @@ This task prevents apt to automatically install all recommended dependencies for
    • -
  • Use bash instead of dash
    +
  • Use bash instead of dash
    - name: use bash instead of dash
@@ -1084,15 +1084,15 @@ This task prevents apt to automatically install all recommended dependencies for
    • -
  • create user vdr
    +
  • create user vdr
    • -
  • Disable release-upgrade notifications
    +
  • Disable release-upgrade notifications
      -
    1. SOMEDAY move from lineinfile to template
      +
    2. SOMEDAY move from lineinfile to template
      - name: disable release-upgrade notifications
@@ -1114,7 +1114,7 @@ This task prevents apt to automatically install all recommended dependencies for
    • -
  • Install essential packages
    +
  • Install essential packages
    - name: apt | install basic packages
@@ -1146,7 +1146,7 @@ This task prevents apt to automatically install all recommended dependencies for
    • -
  • Install additional packages (user defined)
    +
  • Install additional packages (user defined)
    - name: apt | install extra packages
@@ -1160,11 +1160,11 @@ This task prevents apt to automatically install all recommended dependencies for
    • -
  • create directories
    +
  • create directories
    • -
  • create sudoers drop-in for vdr
    +
  • create sudoers drop-in for vdr
    • @@ -1172,8 +1172,8 @@ This task prevents apt to automatically install all recommended dependencies for
    -
    -

    7.3.3 templates

    +
    +

    7.3.3 templates

    {{ ansible_managed | comment('c') }}
@@ -1184,7 +1184,7 @@ APT::Install-Suggests "0";
      -
    1. yavdr sudoers drop-in
      +
    2. yavdr sudoers drop-in

      Allow the vdr user to restart vdr.service and reboot the system @@ -1199,12 +1199,12 @@ Allow the vdr user to restart vdr.service and reboot the system

    -
    -

    7.4 collect facts about the system with custom modules

    +
    +

    7.4 collect facts about the system with custom modules

    -
    -

    7.4.1 variables

    +
    +

    7.4.1 variables

    first_run: False
@@ -1212,12 +1212,12 @@ Allow the vdr user to restart vdr.service and reboot the system
    -
    -

    7.4.2 tasks

    +
    +

    7.4.2 tasks

      -
    1. main.yml
      +
    2. main.yml
      - name: get information about usb and pci hardware and loaded kernel modules
@@ -1266,16 +1266,16 @@ Allow the vdr user to restart vdr.service and reboot the system
    -
    -

    7.5 vdr

    +
    +

    7.5 vdr

    -
    -

    7.5.1 tasks

    +
    +

    7.5.1 tasks

      -
    1. install the basic vdr packages
      +
    2. install the basic vdr packages
      ---
@@ -1294,7 +1294,7 @@ Allow the vdr user to restart vdr.service and reboot the system
      3. -
    3. Add svdrp/svdrp-disc to /etc/services
      +
    4. Add svdrp/svdrp-disc to /etc/services
      - name: add svdrp and svdrp-disc to /etc/services
@@ -1309,7 +1309,7 @@ Allow the vdr user to restart vdr.service and reboot the system
      5. -
    5. Set up the recording directory for the vdr user
      +
    6. Set up the recording directory for the vdr user
      - name: create vdr recdir
@@ -1344,7 +1344,7 @@ Allow the vdr user to restart vdr.service and reboot the system
      7. -
    7. Install additional vdr plugins
      +
    8. Install additional vdr plugins

      The additional plugins to install can be set in the variable {{vdr_plugins}} in the group variables @@ -1362,7 +1362,7 @@ The additional plugins to install can be set in the variable {{vdr_plugins

    -
  • copy vdr configuration files (if they don’t exist yet)
    +
  • copy vdr configuration files (if they don’t exist yet)
    - name: ensure vdr is stopped
@@ -1393,7 +1393,7 @@ The additional plugins to install can be set in the variable {{vdr_plugins
    • -
  • start vdr after network-online.target
    +
  • start vdr after network-online.target
    - name: create directory for vdr.service systemd drop-in files
@@ -1414,8 +1414,8 @@ The additional plugins to install can be set in the variable {{vdr_plugins
    -
    -

    7.5.2 templates

    +
    +

    7.5.2 templates

    Start after network-online.target @@ -1427,12 +1427,12 @@ Start after network-online.target

    -
    -

    7.5.3 files

    +
    +

    7.5.3 files

      -
    1. remote.conf
      +
    2. remote.conf
      LIRC.Up KEY_UP
@@ -1567,7 +1567,7 @@ XKeySym.Next       XF86AudioNext
      3. -
    3. keymacros.conf
      +
    4. keymacros.conf
      # Remote control key macros for VDR
@@ -1593,12 +1593,12 @@ User0     @osdteletext
    -
    -

    7.6 STARTED yavdr-network

    +
    +

    7.6 STARTED yavdr-network

    -
    -

    7.6.1 default variables

    +
    +

    7.6.1 default variables

    install_avahi: true
@@ -1606,8 +1606,8 @@ User0     @osdteletext
    -
    -

    7.6.2 tasks

    +
    +

    7.6.2 tasks

    ---
@@ -1677,17 +1677,17 @@ User0     @osdteletext
    -
    -

    7.7 nfs-server

    +
    +

    7.7 nfs-server

    -
    -

    7.7.1 TODO avahi-services für NFS beim Stoppen des nfs-kernel-servers depublizieren, beim Start wieder announcen

    +
    +

    7.7.1 TODO avahi-services für NFS beim Stoppen des nfs-kernel-servers depublizieren, beim Start wieder announcen

    -
    -

    7.7.2 tasks

    +
    +

    7.7.2 tasks

    ---
@@ -1716,12 +1716,12 @@ User0     @osdteletext
    -
    -

    7.7.3 templates

    +
    +

    7.7.3 templates

      -
    1. /etc/exports
      +
    2. /etc/exports
      /srv *(rw,fsid=0,sync,no_subtree_check,all_squash,anongid={{ vdr.gid }},anonuid={{ vdr.uid }})
@@ -1732,7 +1732,7 @@ User0     @osdteletext
      3. -
    3. avahi services
      +
    4. avahi services
      <?xml version="1.0" standalone='no'?>
@@ -1754,12 +1754,15 @@ User0     @osdteletext
      -
      -

      7.8 STARTED yavdr-remote

      +
      +

      7.8 STARTED yavdr-remote

      +

      +The role yavdr-remote sets up the foundation for using eventlircd, lircd2uinput and the pre-configuration for remote receivers which can be detected by udev. +

      -
      -

      7.8.1 default variables

      +
      +

      7.8.1 default variables

      lircd0_socket: /var/run/lirc/lircd0
@@ -1767,8 +1770,8 @@ User0     @osdteletext
      -
      -

      7.8.2 tasks

      +
      +

      7.8.2 tasks

      ---
@@ -1841,12 +1844,12 @@ User0     @osdteletext
      -
      -

      7.8.3 templates

      +
      +

      7.8.3 templates

        -
      1. Systemd Drop-in to start vdr with lirc support
        +
      2. Systemd Drop-in to start vdr with lirc support
        {% if frontend != 'kodi' %}
@@ -1857,7 +1860,7 @@ User0     @osdteletext
        3. -
      3. Systemd Drop-in to start lircd2uinput with lircd
        +
      4. Systemd Drop-in to start lircd2uinput with lircd
        [Service]
@@ -1867,7 +1870,7 @@ User0     @osdteletext
        5. -
      5. create /etc/rc_maps.cfg
        +
      6. create /etc/rc_maps.cfg
        {{ ansible_managed | comment }}
@@ -2059,19 +2062,19 @@ ati_remote    rc-medion-x10-digitainer   /lib/udev/rc_keymaps/rc-medion-x10-digi
      -
      -

      7.8.4 files

      +
      +

      7.8.4 files

      -
      -

      7.9 pulseaudio

      +
      +

      7.9 pulseaudio

      -
      -

      7.9.1 tasks

      +
      +

      7.9.1 tasks

      ---
@@ -2094,8 +2097,8 @@ ati_remote    rc-medion-x10-digitainer   /lib/udev/rc_keymaps/rc-medion-x10-digi
      -
      -

      7.9.2 templates

      +
      +

      7.9.2 templates

      # Use PulseAudio by default
@@ -2118,12 +2121,12 @@ ati_remote    rc-medion-x10-digitainer   /lib/udev/rc_keymaps/rc-medion-x10-digi
      -
      -

      7.10 yavdr-xorg

      +
      +

      7.10 yavdr-xorg

      -
      -

      7.10.1 About the GUI session

      +
      +

      7.10.1 About the GUI session

      The X-Server is started by using the two systemd units xlogin@.service and x@.service provided by the package xlogin. The former is enabled (and started) for the vdr user - which results (using the default settings for the user vdr with the uid 666) in the activation of xlogin@vdr.service when reaching the graphical.target. To simplify starting and stopping the X-server and the desktop session a yavdr-xorg.service is provided by the package yavdr-xorg, which depends on the two units mentioned before. @@ -2152,8 +2155,8 @@ In order to achive a clean shutdown of the session, x@t7.service is

      -
      -

      7.10.2 default variables

      +
      +

      7.10.2 default variables

      first_run: False
@@ -2176,12 +2179,12 @@ In order to achive a clean shutdown of the session, x@t7.service is
      -
      -

      7.10.3 tasks

      +
      +

      7.10.3 tasks

        -
      1. main.yml
        +
      2. main.yml
        ---
@@ -2194,7 +2197,7 @@ In order to achive a clean shutdown of the session, x@t7.service is
        3. -
      3. setup-xorg.yml
        +
      4. setup-xorg.yml
        ---
@@ -2315,7 +2318,7 @@ In order to achive a clean shutdown of the session, x@t7.service is
        5. -
      5. detect-xorg.yml
        +
      6. detect-xorg.yml
        ---
@@ -2475,7 +2478,7 @@ In order to achive a clean shutdown of the session, x@t7.service is
        7. -
      7. intel.yml
        +
      8. intel.yml

        KMS drivers (like for intel (i915) and amd (radeon)) require additional configuration beneath a customized xorg.conf - for a „static“ output configuration (which works if the TV or AV receiver is not turned on) we need to force loading the display(s) EDID early during the boot process. @@ -2522,12 +2525,12 @@ Please note that rescanning the connected displays works only after removing the

      -
      -

      7.10.4 templates

      +
      +

      7.10.4 templates

        -
      1. grub
        +
      2. grub
        {% set output_flag = 'D' if ("HDMI" in xorg.primary.connector or "DVI" in xorg.primary.connector or "DP" in xorg.primary.connector) else 'e' %} 
@@ -2537,11 +2540,11 @@ Please note that rescanning the connected displays works only after removing the
        3. -
      3. xorg
        +
      4. xorg
          -
        1. x-verbose@.service
          +
        2. x-verbose@.service
          # file: roles/yavdr-xorg/templates/systemd/system/x-verbose@.service.j2
@@ -2557,7 +2560,7 @@ Please note that rescanning the connected displays works only after removing the
          3. -
        3. Drop-in snippet for x@.service
          +
        4. Drop-in snippet for x@.service
          [Unit]
@@ -2583,7 +2586,7 @@ Please note that rescanning the connected displays works only after removing the
          5. -
        5. Drop-in snippet for vdr.service
          +
        6. Drop-in snippet for vdr.service
          {{ ansible_managed | comment }}
@@ -2595,7 +2598,7 @@ Please note that rescanning the connected displays works only after removing the
          7. -
        7. xorg.conf snippets
          +
        8. xorg.conf snippets
          {{ ansible_managed | comment }}
@@ -2609,7 +2612,7 @@ EndSection
          9. -
        9. xorg.conf
          +
        10. xorg.conf
          Section "Device"
@@ -2935,7 +2938,7 @@ EndSection
        5. -
      5. vdr
        +
      6. vdr

        Set environment variables for system locale and user session on startup @@ -2951,12 +2954,12 @@ Set environment variables for system locale and user session on startup

      -
      -

      7.10.5 files

      +
      +

      7.10.5 files

        -
      1. initramfs EDID hook
        +
      2. initramfs EDID hook
        #!/bin/bash
@@ -2982,16 +2985,16 @@ manual_add_modules i915 radeon
        -
        -

        7.11 yavdr-desktop

        +
        +

        7.11 yavdr-desktop

        -
        -

        7.11.1 Tasks

        +
        +

        7.11.1 Tasks

          -
        1. main.yml
          +
        2. main.yml
          ---
@@ -3008,6 +3011,7 @@ manual_add_modules i915 radeon
     - '{{ vdr.home }}/.config/systemd/user'
     - '{{ vdr.home }}/.config/openbox'
     - '{{ vdr.home }}/.config/pulse'
+    - '{{ vdr.home }}/bin'
 
 - name: expand template for .xinitrc for vdr user
   template:
@@ -3090,6 +3094,14 @@ manual_add_modules i915 radeon
     owner: '{{ vdr.user }}'
     group: '{{ vdr.group }}'
 
+- name: create detect-second-diplay script
+  template:
+    src: templates/bin/detect-second-display.j2
+    dest: '{{ vdr.home }}/bin/detect-second-display'
+    mode: 0755
+    owner: '{{ vdr.user }}'
+    group: '{{ vdr.group }}'
+
 - name: create openbox-second.service for the session
   template:
     src: templates/systemd/user/openbox-second.service.j2
@@ -3140,16 +3152,16 @@ manual_add_modules i915 radeon
        -
        -

        7.11.2 Templates

        +
        +

        7.11.2 Templates

          -
        1. xorg configuration
          +
        2. xorg configuration
            -
          1. .Xresources
            +
          2. .Xresources
            xterm*background: Black
@@ -3172,7 +3184,7 @@ XTerm.vt100.font: 7x13
            3. -
          3. .xinitrc
            +
          4. .xinitrc
            #!/bin/bash
@@ -3184,11 +3196,11 @@ XTerm.vt100.font: 7x13
          3. -
        3. openbox
          +
        4. openbox
            -
          1. autostart
            +
          2. autostart
            # forward environment variables to an environment file and the systemd user session
@@ -3224,7 +3236,7 @@ systemctl --user isolate yavdr-desktop.target
            3. -
          3. rc.xml
            +
          4. rc.xml
            <?xml version="1.0" encoding="UTF-8"?>
@@ -4044,7 +4056,7 @@ systemctl --user isolate yavdr-desktop.target
            5. -
          5. rc2.xml
            +
          6. rc2.xml
            <?xml version="1.0" encoding="UTF-8"?>
@@ -4867,11 +4879,11 @@ systemctl --user isolate yavdr-desktop.target
          5. -
        5. Systemd User Session
          +
        6. Systemd User Session
            -
          1. yavdr-desktop.target
            +
          2. yavdr-desktop.target
            [Unit]
@@ -4884,15 +4896,27 @@ systemctl --user isolate yavdr-desktop.target
            3. -
          3. detect-second-display
            +
          4. detect-second-display
            +
            #!/bin/bash
+source <(systemctl --user show-environment)
+SECOND_DISPLAY="${DISPLAY%\.[0-9]*}.1"
+if xrandr -d "$SECOND_DISPLAY" -q | grep -q "connected"; then
+    [ "$DISPLAY" != "$SECOND_DISPLAY" ] && d="DISPLAY=$SECOND_DISPLAY" || d="DISPLAY=$DISPLAY"
+    echo "$d" > ~/.second_display;
+else
+    rm -f ~/.second_display
+fi
+
            +
            +
            [Unit]
 Description=Detect second DISPLAY using xrandr
 
 [Service]
 Type=oneshot
-ExecStart=/bin/bash -c 'export DISPLAY=$DISPLAY.1; xrandr -q | grep "connected" && echo "DISPLAY=$DISPLAY" > ~/.second_display || rm -f ~/.second_display'
+ExecStart=%h/bin/detect-second-display
 
 [Install]
 WantedBy=yavdr-desktop.target
@@ -4900,7 +4924,7 @@ systemctl --user isolate yavdr-desktop.target
            5. -
          5. openbox-second.service
            +
          6. openbox-second.service
            [Unit]
@@ -4922,7 +4946,7 @@ systemctl --user isolate yavdr-desktop.target
            7. -
          7. osd2web.service
            +
          8. osd2web.service
            [Unit]
@@ -4945,7 +4969,7 @@ systemctl --user isolate yavdr-desktop.target
            9. -
          9. tmux.service
            +
          10. tmux.service
            [Unit]
@@ -4964,7 +4988,7 @@ systemctl --user isolate yavdr-desktop.target
            11. -
          11. wm-exit.service
            +
          12. wm-exit.service
            [Unit]
@@ -4983,7 +5007,7 @@ systemctl --user isolate yavdr-desktop.target
          7. -
        7. irexec
          +
        8. irexec

          irexec.service starts irexec for the user session @@ -5017,12 +5041,12 @@ end

        -
        -

        7.12 samba-install

        +
        +

        7.12 samba-install

        -
        -

        7.12.1 tasks

        +
        +

        7.12.1 tasks

        ---
@@ -5044,12 +5068,12 @@ end
        -
        -

        7.13 samba-config

        +
        +

        7.13 samba-config

        -
        -

        7.13.1 tasks

        +
        +

        7.13.1 tasks

        ---
@@ -5074,16 +5098,16 @@ end
        -
        -

        7.13.2 templates

        +
        +

        7.13.2 templates

          -
        1. smb.conf
          +
        2. smb.conf
            -
          1. global settings
            +
          2. global settings
            {{ ansible_managed | comment }}
@@ -5169,7 +5193,7 @@ end
            3. -
          3. media directories
            +
          4. media directories
            {% for name, path in media_dirs.iteritems() %}
@@ -5191,7 +5215,7 @@ end
            5. -
          5. include custom samba exports
            +
          6. include custom samba exports
            include = /etc/samba/smb.conf.custom
@@ -5204,15 +5228,15 @@ end
        -
        -

        7.14 STARTED autoinstall-drivers

        +
        +

        7.14 STARTED autoinstall-drivers

        It would be nice to be able to detect if it is suitable to install those drivers:

        -
        -

        7.14.1 TODO sundtek for Sundtek devices (local or network connection)

        +
        +

        7.14.1 TODO sundtek for Sundtek devices (local or network connection)

        Vendor-IDs: @@ -5223,7 +5247,7 @@ Vendor-IDs:

          -
        1. planned packages
          +
        2. planned packages
          • yavdr-hardware-sundtek
            • @@ -5234,8 +5258,8 @@ Vendor-IDs:
        -
        -

        7.14.2 TODO drivers for TT S2-6400 FF

        +
        +

        7.14.2 TODO drivers for TT S2-6400 FF

        https://github.com/s-moch/linux-saa716x - kann man den relevanten Teil als dkms-Paket bauen? @@ -5243,15 +5267,15 @@ Vendor-IDs:

        -
        -

        7.15 autoinstall-ubuntu-drivers

        +
        +

        7.15 autoinstall-ubuntu-drivers

        The tool ubuntu-drivers is used to install the matching driver version for nvidia graphics cards, virtualbox guest additions and Intel and AMD microcode updates.

        -
        -

        7.15.1 tasks

        +
        +

        7.15.1 tasks

        ---
@@ -5274,8 +5298,8 @@ The tool ubuntu-drivers is used to install the matching driver version for nvidi
        -
        -

        7.16 autoinstall-virtualbox-guest

        +
        +

        7.16 autoinstall-virtualbox-guest

        This role installs the guest additions for virtualbox guests on Ubuntu 16.04 @@ -5326,12 +5350,12 @@ This role installs the guest additions for virtualbox guests on Ubuntu 16.04

        -
        -

        7.17 autoinstall-atric-usb

        +
        +

        7.17 autoinstall-atric-usb

        -
        -

        7.17.1 dependencies

        +
        +

        7.17.1 dependencies

        ---
@@ -5343,8 +5367,8 @@ This role installs the guest additions for virtualbox guests on Ubuntu 16.04
        -
        -

        7.17.2 tasks

        +
        +

        7.17.2 tasks

        ---
@@ -5386,8 +5410,8 @@ This role installs the guest additions for virtualbox guests on Ubuntu 16.04
        -
        -

        7.17.3 templates

        +
        +

        7.17.3 templates

        {{ ansible_managed | comment }}
@@ -5416,12 +5440,12 @@ This role installs the guest additions for virtualbox guests on Ubuntu 16.04
        -
        -

        7.18 autoinstall-yausbir

        +
        +

        7.18 autoinstall-yausbir

        -
        -

        7.18.1 dependencies

        +
        +

        7.18.1 dependencies

        ---
@@ -5432,8 +5456,8 @@ This role installs the guest additions for virtualbox guests on Ubuntu 16.04
        -
        -

        7.18.2 tasks

        +
        +

        7.18.2 tasks

        ---
@@ -5475,8 +5499,8 @@ This role installs the guest additions for virtualbox guests on Ubuntu 16.04
        -
        -

        7.18.3 templates

        +
        +

        7.18.3 templates

        {{ ansible_managed | comment }}
@@ -5504,15 +5528,15 @@ This role installs the guest additions for virtualbox guests on Ubuntu 16.04
        -
        -

        7.19 autoinstall-satip

        +
        +

        7.19 autoinstall-satip

        If a Sat>IP Server responds to a discovery request, the package vdr-plugin-satip is installed.

        -
        -

        7.19.1 tasks

        +
        +

        7.19.1 tasks

        ---
@@ -5537,12 +5561,12 @@ If a Sat>IP Server responds to a discovery request, the package vdr-plugin-sa
        -
        -

        7.20 autoinstall-targavfd

        +
        +

        7.20 autoinstall-targavfd

        -
        -

        7.20.1 tasks

        +
        +

        7.20.1 tasks

        ---
@@ -5558,12 +5582,12 @@ If a Sat>IP Server responds to a discovery request, the package vdr-plugin-sa
        -
        -

        7.21 autoinstall-imonlcd

        +
        +

        7.21 autoinstall-imonlcd

        -
        -

        7.21.1 tasks

        +
        +

        7.21.1 tasks

        ---
@@ -5579,12 +5603,12 @@ If a Sat>IP Server responds to a discovery request, the package vdr-plugin-sa
        -
        -

        7.22 autoinstall-libcecdaemon

        +
        +

        7.22 autoinstall-libcecdaemon

        -
        -

        7.22.1 tasks

        +
        +

        7.22.1 tasks

        ---
@@ -5600,12 +5624,12 @@ If a Sat>IP Server responds to a discovery request, the package vdr-plugin-sa
        -
        -

        7.23 autoinstall-pvr350

        +
        +

        7.23 autoinstall-pvr350

        -
        -

        7.23.1 tasks

        +
        +

        7.23.1 tasks

        ---
@@ -5621,8 +5645,8 @@ If a Sat>IP Server responds to a discovery request, the package vdr-plugin-sa
        -
        -

        7.24 autoinstall-hauppauge-pvr

        +
        +

        7.24 autoinstall-hauppauge-pvr

        ---
@@ -5637,12 +5661,12 @@ If a Sat>IP Server responds to a discovery request, the package vdr-plugin-sa
        -
        -

        7.25 autoinstall-firmware

        +
        +

        7.25 autoinstall-firmware

        -
        -

        7.25.1 dependencies

        +
        +

        7.25.1 dependencies

        ---
@@ -5653,8 +5677,8 @@ If a Sat>IP Server responds to a discovery request, the package vdr-plugin-sa
        -
        -

        7.25.2 tasks

        +
        +

        7.25.2 tasks

        ---
@@ -5695,12 +5719,12 @@ If a Sat>IP Server responds to a discovery request, the package vdr-plugin-sa
        -
        -

        7.26 autoinstall-dvbsky-firmware

        +
        +

        7.26 autoinstall-dvbsky-firmware

        -
        -

        7.26.1 dependencies

        +
        +

        7.26.1 dependencies

        ---
@@ -5711,8 +5735,8 @@ If a Sat>IP Server responds to a discovery request, the package vdr-plugin-sa
        -
        -

        7.26.2 defaults

        +
        +

        7.26.2 defaults

        ---
@@ -5722,8 +5746,8 @@ If a Sat>IP Server responds to a discovery request, the package vdr-plugin-sa
        -
        -

        7.26.3 tasks

        +
        +

        7.26.3 tasks

        ---
@@ -5773,15 +5797,15 @@ If a Sat>IP Server responds to a discovery request, the package vdr-plugin-sa
        -
        -

        7.27 TODO autoinstall-dvbhddevice

        +
        +

        7.27 TODO autoinstall-dvbhddevice

        Problem: woher kommt der Treiber (AFAIK noch nicht im Kernel)? Die Firmware sollte in yavdr-firmware stecken

        -
        -

        7.27.1 dependencies

        +
        +

        7.27.1 dependencies

        ---
@@ -5792,8 +5816,8 @@ Problem: woher kommt der Treiber (AFAIK noch nicht im Kernel)? Die Firmware soll
        -
        -

        7.27.2 tasks

        +
        +

        7.27.2 tasks

        ---
@@ -5810,12 +5834,12 @@ Problem: woher kommt der Treiber (AFAIK noch nicht im Kernel)? Die Firmware soll
        -
        -

        7.28 autoinstall-dvbsddevice

        +
        +

        7.28 autoinstall-dvbsddevice

        -
        -

        7.28.1 dependencies

        +
        +

        7.28.1 dependencies

        ---
@@ -5826,8 +5850,8 @@ Problem: woher kommt der Treiber (AFAIK noch nicht im Kernel)? Die Firmware soll
        -
        -

        7.28.2 tasks

        +
        +

        7.28.2 tasks

        ---
@@ -5845,12 +5869,12 @@ Problem: woher kommt der Treiber (AFAIK noch nicht im Kernel)? Die Firmware soll
        -
        -

        7.29 autoinstall-hardware-irmp

        +
        +

        7.29 autoinstall-hardware-irmp

        -
        -

        7.29.1 dependencies

        +
        +

        7.29.1 dependencies

        ---
@@ -5861,8 +5885,8 @@ Problem: woher kommt der Treiber (AFAIK noch nicht im Kernel)? Die Firmware soll
        -
        -

        7.29.2 tasks

        +
        +

        7.29.2 tasks

        ---
@@ -5878,21 +5902,21 @@ Problem: woher kommt der Treiber (AFAIK noch nicht im Kernel)? Die Firmware soll
        -
        -

        7.30 kodi

        +
        +

        7.30 kodi

        -
        -

        7.30.1 tasks

        +
        +

        7.30.1 tasks

          -
        1. Install KODI
          +
        2. Install KODI
            -
          • main.yml
            -
            +
          • main.yml
            +
            - import_tasks: install-kodi.yml tags=install,update,kodi:install
 - import_tasks: configure-kodi.yml tags=install,update,kodi:configure
@@ -5900,7 +5924,7 @@ Problem: woher kommt der Treiber (AFAIK noch nicht im Kernel)? Die Firmware soll
            • -
          • install-kodi.yml
            +
          • install-kodi.yml
            ---
@@ -5932,7 +5956,7 @@ Problem: woher kommt der Treiber (AFAIK noch nicht im Kernel)? Die Firmware soll
            • -
          • configure-kodi.yml
            +
          • configure-kodi.yml
            - name: create kodi.service for the user session
@@ -5981,12 +6005,12 @@ Problem: woher kommt der Treiber (AFAIK noch nicht im Kernel)? Die Firmware soll
        -
        -

        7.30.2 templates

        +
        +

        7.30.2 templates

          -
        1. kodi.service
          +
        2. kodi.service

          This systemd unit for the user session starts (and stops) kodi. @@ -6011,15 +6035,15 @@ This systemd unit for the user session starts (and stops) kodi.

        -
        -

        7.30.3 files

        +
        +

        7.30.3 files

        Those configuration files provide a preconfiguration for kodi which overrides the system wide configuration

          -
        1. Lircmap.xml
          +
        2. Lircmap.xml

          This file allows to map keys sent by remotes via eventlircd (which uses the name devinput) to kodi key names. @@ -6090,14 +6114,14 @@ This file allows to map keys sent by remotes via eventlircd (which uses the name

        3. -
      3. keymaps
        +
      4. keymaps

        This file maps the keys defined in Lircmap.xml to actions within kodi.

          -
        1. remote.xml
          +
        2. remote.xml
          <?xml version="1.0" encoding="UTF-8"?>
@@ -6649,17 +6673,17 @@ This file maps the keys defined in Lircmap.xml to actions within kodi.
      -
      -

      7.31 dvd

      +
      +

      7.31 dvd

      -
      -

      7.31.1 tasks

      +
      +

      7.31.1 tasks

        -
      • install libdvd-pkg, allow programs to eject optical media
        -
        +
      • install libdvd-pkg, allow programs to eject optical media
        +
        ---
 # file: roles/dvd/tasks/main.yml
@@ -6700,17 +6724,17 @@ This file maps the keys defined in Lircmap.xml to actions within kodi.
      -
      -

      7.32 install-sundtek

      +
      +

      7.32 install-sundtek

      -
      -

      7.32.1 variables

      +
      +

      7.32.1 variables

      -
      -

      7.32.2 tasks

      +
      +

      7.32.2 tasks

      ---
@@ -6759,12 +6783,12 @@ This file maps the keys defined in Lircmap.xml to actions within kodi.
      -
      -

      7.32.3 templates

      +
      +

      7.32.3 templates

        -
      1. /etc/sundtek.conf
        +
      2. /etc/sundtek.conf
        # ----- GLOBAL SECTION -----
@@ -6872,8 +6896,8 @@ This file maps the keys defined in Lircmap.xml to actions within kodi.
      -
      -

      7.33 template-test

      +
      +

      7.33 template-test

      ---
@@ -7114,12 +7138,12 @@ EndSection
      -
      -

      7.34 wakeup

      +
      +

      7.34 wakeup

      -
      -

      7.34.1 defaults

      +
      +

      7.34.1 defaults

      ---
@@ -7129,8 +7153,8 @@ EndSection
      -
      -

      7.34.2 tasks

      +
      +

      7.34.2 tasks

      ---
@@ -7151,8 +7175,8 @@ EndSection
      -
      -

      7.34.3 templates

      +
      +

      7.34.3 templates

      {{ ansible_managed | comment }}
@@ -7178,12 +7202,12 @@ ACPI_START_AHEAD=5
      -
      -

      7.35 grub-config

      +
      +

      7.35 grub-config

      -
      -

      7.35.1 default variables

      +
      +

      7.35.1 default variables

      system:
@@ -7195,8 +7219,8 @@ ACPI_START_AHEAD=5
      -
      -

      7.35.2 tasks

      +
      +

      7.35.2 tasks

      ---
@@ -7221,8 +7245,8 @@ ACPI_START_AHEAD=5
      -
      -

      7.35.3 templates

      +
      +

      7.35.3 templates

      #!/bin/sh
@@ -7245,8 +7269,8 @@ menuentry "PowerOff" 
-
      7.35.4 handlers
      
+
      
+
      7.35.4 handlers
      
 
      
 
      
 
      ---
@@ -7269,15 +7293,15 @@ menuentry "PowerOff" 
-
      8 Modules
      
+
      
+
      8 Modules
      
 
      
 
      
 This section contains custom modules for the yaVDR Playbooks. They are used to collect facts about the system and configure applications and daemons.
 
      
 
      
-
      
-
      8.1 hardware_facts.py
      
+
      
+
      8.1 hardware_facts.py
      
 
      
 
      
 
      # This Module collects the vendor- and device ids for USB- and PCI(e)-devices and currently loaded kernel modules.
@@ -7455,8 +7479,8 @@ This section contains custom modules for the yaVDR Playbooks. They are used to c
 
      
 
      
 
      
-
      
-
      8.2 pci_facts.py
      
+
      
+
      8.2 pci_facts.py
      
 
      
 
      
 
      @@ -7532,8 +7556,8 @@ This section contains custom modules for the yaVDR Playbooks. They are used to c
 
      
 
      
 
      
-
      
-
      8.3 satip_facts.py
      
+
      
+
      8.3 satip_facts.py
      
 
      
 
      
 
      DOCUMENTATION = '''
@@ -7657,8 +7681,8 @@ This section contains custom modules for the yaVDR Playbooks. They are used to c
 
      
 
      
 
      
-
      
-
      8.4 xrandr_facts.py
      
+
      
+
      8.4 xrandr_facts.py
      
 
      
 
        
 
      • [ ] support multiple screens (-d :0.0 .. :0.n)
        • 
@@ -7945,8 +7969,8 @@ This section contains custom modules for the yaVDR Playbooks. They are used to c
 
      
 
      
 
      
-
      
-
      9 Handlers
      
+
      
+
      9 Handlers
      
 
      
 
      
 
      - name: Reconfigure unattended upgrades with dpkg
@@ -8039,7 +8063,7 @@ This section contains custom modules for the yaVDR Playbooks. They are used to c
 
      
 
      
 
      Autor: Alexander Grothe <seahawk1986@gmx.de>
      
-
      Created: 2018-09-20 Do 09:01
      
+
      Created: 2018-09-30 So 10:17
      
 
      Validate
      
 
      
 
diff --git a/Manual.org b/Manual.org
index 40ec9d9..0abb53a 100644
--- a/Manual.org
+++ b/Manual.org
@@ -2859,6 +2859,7 @@ exit 0
     - '{{ vdr.home }}/.config/systemd/user'
     - '{{ vdr.home }}/.config/openbox'
     - '{{ vdr.home }}/.config/pulse'
+    - '{{ vdr.home }}/bin'
 
 - name: expand template for .xinitrc for vdr user
   template:
@@ -2941,6 +2942,14 @@ exit 0
     owner: '{{ vdr.user }}'
     group: '{{ vdr.group }}'
 
+- name: create detect-second-diplay script
+  template:
+    src: templates/bin/detect-second-display.j2
+    dest: '{{ vdr.home }}/bin/detect-second-display'
+    mode: 0755
+    owner: '{{ vdr.user }}'
+    group: '{{ vdr.group }}'
+
 - name: create openbox-second.service for the session
   template:
     src: templates/systemd/user/openbox-second.service.j2
@@ -4724,13 +4733,24 @@ AllowIsolate=yes
 :PROPERTIES:
 :ID:       e46166b1-0550-41c6-a7ec-d7a2622f87db
 :END:
+#+BEGIN_SRC shell :tangle roles/yavdr-desktop/templates/bin/detect-second-display.j2 :mkdirp yes :padline no
+#!/bin/bash
+source <(systemctl --user show-environment)
+SECOND_DISPLAY="${DISPLAY%\.[0-9]*}.1"
+if xrandr -d "$SECOND_DISPLAY" -q | grep -q "connected"; then
+    [ "$DISPLAY" != "$SECOND_DISPLAY" ] && d="DISPLAY=$SECOND_DISPLAY" || d="DISPLAY=$DISPLAY"
+    echo "$d" > ~/.second_display;
+else
+    rm -f ~/.second_display
+fi
+#+END_SRC
 #+BEGIN_SRC conf :tangle roles/yavdr-desktop/templates/systemd/user/detect-second-display.service.j2 :mkdirp yes :padline no
 [Unit]
 Description=Detect second DISPLAY using xrandr
 
 [Service]
 Type=oneshot
-ExecStart=/bin/bash -c 'export DISPLAY=$DISPLAY.1; xrandr -q | grep "connected" && echo "DISPLAY=$DISPLAY" > ~/.second_display || rm -f ~/.second_display'
+ExecStart=%h/bin/detect-second-display
 
 [Install]
 WantedBy=yavdr-desktop.target
diff --git a/roles/yavdr-desktop/tasks/main.yml b/roles/yavdr-desktop/tasks/main.yml
index 0fe2a18..bb3eacf 100644
--- a/roles/yavdr-desktop/tasks/main.yml
+++ b/roles/yavdr-desktop/tasks/main.yml
@@ -12,6 +12,7 @@
     - '{{ vdr.home }}/.config/systemd/user'
     - '{{ vdr.home }}/.config/openbox'
     - '{{ vdr.home }}/.config/pulse'
+    - '{{ vdr.home }}/bin'
 
 - name: expand template for .xinitrc for vdr user
   template:
@@ -94,6 +95,14 @@
     owner: '{{ vdr.user }}'
     group: '{{ vdr.group }}'
 
+- name: create detect-second-diplay script
+  template:
+    src: templates/bin/detect-second-display.j2
+    dest: '{{ vdr.home }}/bin/detect-second-display'
+    mode: 0755
+    owner: '{{ vdr.user }}'
+    group: '{{ vdr.group }}'
+
 - name: create openbox-second.service for the session
   template:
     src: templates/systemd/user/openbox-second.service.j2
diff --git a/roles/yavdr-desktop/templates/bin/detect-second-display.j2 b/roles/yavdr-desktop/templates/bin/detect-second-display.j2
new file mode 100644
index 0000000..53dcbf4
--- /dev/null
+++ b/roles/yavdr-desktop/templates/bin/detect-second-display.j2
@@ -0,0 +1,9 @@
+#!/bin/bash
+source <(systemctl --user show-environment)
+SECOND_DISPLAY="${DISPLAY%\.[0-9]*}.1"
+if xrandr -d "$SECOND_DISPLAY" -q | grep -q "connected"; then
+    [ "$DISPLAY" != "$SECOND_DISPLAY" ] && d="DISPLAY=$SECOND_DISPLAY" || d="DISPLAY=$DISPLAY"
+    echo "$d" > ~/.second_display;
+else
+    rm -f ~/.second_display
+fi
diff --git a/roles/yavdr-desktop/templates/systemd/user/detect-second-display.service.j2 b/roles/yavdr-desktop/templates/systemd/user/detect-second-display.service.j2
index 55f5fbe..f9fe627 100644
--- a/roles/yavdr-desktop/templates/systemd/user/detect-second-display.service.j2
+++ b/roles/yavdr-desktop/templates/systemd/user/detect-second-display.service.j2
@@ -3,7 +3,7 @@ Description=Detect second DISPLAY using xrandr
 
 [Service]
 Type=oneshot
-ExecStart=/bin/bash -c 'export DISPLAY=$DISPLAY.1; xrandr -q | grep "connected" && echo "DISPLAY=$DISPLAY" > ~/.second_display || rm -f ~/.second_display'
+ExecStart=%h/bin/detect-second-display
 
 [Install]
 WantedBy=yavdr-desktop.target