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