From: Christian Heller Date: Sun, 10 Sep 2017 11:22:51 +0000 (+0200) Subject: Fix some more bugs in new ansible tree. X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/static/todos?a=commitdiff_plain;h=a1030f3639976cdc05f55f49e66cdfce062418f9;p=config Fix some more bugs in new ansible tree. --- diff --git a/ansible/config_new.yml b/ansible/config_new.yml index 2f86ac3..55ecd90 100644 --- a/ansible/config_new.yml +++ b/ansible/config_new.yml @@ -71,7 +71,7 @@ # Ensure X window environment. - name: ensure minimal X window environment apt: name={{item}} state=present - with_lines: cat ~/config/ansible/files/apt-mark_new/{{ system_name }}/minimal_x | sed -e 's/ *#.*$//' + with_lines: cat ~/config/ansible/files/apt-mark_new/minimal/minimal_x | sed -e 's/ *#.*$//' #- name: ensure 3d acceleration and optimus switch # apt: name={{item}} state=present # with_lines: cat ~/config/ansible/files/apt-mark/3d_acceleration | sed -e 's/ *#.*$//' @@ -105,7 +105,7 @@ # Remove undesired packages - name: collect desired packages - shell: cat files/apt-mark/minimal/* files/apt-mark_new/{{ system_name }}/* | sed -e 's/ *#.*$//' > /tmp/white_list_unsorted && sort /tmp/white_list_unsorted > /tmp/white_list_sorted + shell: cat files/apt-mark_new/minimal/* files/apt-mark_new/{{ system_name }}/* | sed -e 's/ *#.*$//' > /tmp/white_list_unsorted && sort /tmp/white_list_unsorted > /tmp/white_list_sorted - name: collect currently installed packages shell: dpkg-query -Wf '${Package}\n' > /tmp/all_unsorted && sort /tmp/all_unsorted > /tmp/all_sorted - name: create black list of packages to mark as automatically installed from the difference between the required packages and the packages currently installed diff --git a/ansible/files/apt-mark_new/W530/minimal_x b/ansible/files/apt-mark_new/W530/minimal_x deleted file mode 100644 index f785794..0000000 --- a/ansible/files/apt-mark_new/W530/minimal_x +++ /dev/null @@ -1,4 +0,0 @@ -libpam-systemd # needed to start X as non-root -xinit # contains startx -xserver-xorg-core -xserver-xorg-input-evdev # supports all input devices the kernel knows about diff --git a/ansible/files/apt-mark_new/X200s/minimal_x b/ansible/files/apt-mark_new/X200s/minimal_x deleted file mode 100644 index 04cbc9c..0000000 --- a/ansible/files/apt-mark_new/X200s/minimal_x +++ /dev/null @@ -1,3 +0,0 @@ -libpam-systemd # needed to start X as non-root -xinit # contains startx -xserver-xorg-core diff --git a/ansible/files/apt-mark_new/minimal/minimal_x b/ansible/files/apt-mark_new/minimal/minimal_x new file mode 100644 index 0000000..f785794 --- /dev/null +++ b/ansible/files/apt-mark_new/minimal/minimal_x @@ -0,0 +1,4 @@ +libpam-systemd # needed to start X as non-root +xinit # contains startx +xserver-xorg-core +xserver-xorg-input-evdev # supports all input devices the kernel knows about diff --git a/ansible/files/console/___etc___default___keyboard b/ansible/files/console/___etc___default___keyboard index b8f918b..25a46b7 100644 --- a/ansible/files/console/___etc___default___keyboard +++ b/ansible/files/console/___etc___default___keyboard @@ -1 +1,2 @@ +XKBMODEL="pc105" # questionable, but works fine as default XKBLAYOUT="de"