Resolving merge problems.
This commit is contained in:
commit
1130b8159c
@ -1,9 +1,10 @@
|
|||||||
---
|
---
|
||||||
# Manages reactivation of pulseaudio as system daemon
|
# Manages reactivation of pulseaudio as system daemon
|
||||||
|
|
||||||
- name: "Changing pulseaudio upstart script"
|
- name: "Allowing pulseaudio to run at startup"
|
||||||
template:
|
replace:
|
||||||
src: pulseaudio.conf
|
regexp: '^#start on runlevel.*$'
|
||||||
|
replace: 'start on runlevel [2345]'
|
||||||
dest: /etc/init/pulseaudio.conf
|
dest: /etc/init/pulseaudio.conf
|
||||||
owner: root
|
owner: root
|
||||||
group: root
|
group: root
|
||||||
|
@ -1,12 +1,11 @@
|
|||||||
---
|
---
|
||||||
- name: Removing upgrade-notification from /etc
|
|
||||||
lineinfile:
|
- name: Checking for upgrade-notification configuration
|
||||||
dest: /etc/update-manager/release-upgrades
|
stat:
|
||||||
line: "Prompt=never"
|
path: /usr/share/upstart/sessions/update-notifier-release.conf
|
||||||
regexp: '^Prompt='
|
register: update_notifier_release_stat
|
||||||
state: present
|
ignore_errors: yes
|
||||||
|
|
||||||
- name: Removing notifications for system upgrade
|
- name: Removing notifications for system upgrade
|
||||||
shell: >
|
shell: mv /usr/share/upstart/sessions/update-notifier-release.conf /usr/share/upstart/sessions/update-notifier-release.conf.disabled
|
||||||
test -f /usr/share/upstart/sessions/update-notifier-release.conf && mv /usr/share/upstart/sessions/update-notifier-release.conf /usr/share/upstart/sessions/update-notifier-release.conf.disabled
|
when: update_notifier_release_stat|success
|
||||||
ignore_errors: yes
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user