evolix/ansible-roles
22
2
Fork 2
Code Issues 61 Pull requests 19 Releases 33 Wiki Activity

evolinux-base: parse fstab with better regex

Browse source 
The fstab file usually has fields separated by spaces
but sometimes they are separated by tabs.
This commit is contained in:
Jérémy Lecour 2017-10-04 14:29:19 +02:00 committed by Jérémy Lecour
parent 46c1cbd1a4
commit 5ffc94281f
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
evolinux-base/tasks/fstab.yml
View file

@ -16,7 +16,7 @@
replace: '\1{{ evolinux_fstab_home_options | mandatory }}\3' replace: '\1{{ evolinux_fstab_home_options | mandatory }}\3'
notify: remount /home notify: remount /home
when: when:
- "' /home ' in fstab_content.stdout" - fstab_content.stdout | regex_search('\s/home\s')
- evolinux_fstab_home - evolinux_fstab_home
- name: /tmp partition is customized - name: /tmp partition is customized
@ -25,7 +25,7 @@
regexp: '([^#]\s+/tmp\s+\S+\s+)([a-z,]+)(\s+)' regexp: '([^#]\s+/tmp\s+\S+\s+)([a-z,]+)(\s+)'
replace: '\1{{ evolinux_fstab_tmp_options | mandatory }}\3' replace: '\1{{ evolinux_fstab_tmp_options | mandatory }}\3'
when: when:
- "' /tmp ' in fstab_content.stdout" - fstab_content.stdout | regex_search('\s/tmp\s')
- evolinux_fstab_tmp - evolinux_fstab_tmp
- name: /usr partition is customized - name: /usr partition is customized
@ -34,7 +34,7 @@
regexp: '([^#]\s+/usr\s+\S+\s+)([a-z,]+)(\s+)' regexp: '([^#]\s+/usr\s+\S+\s+)([a-z,]+)(\s+)'
replace: '\1{{ evolinux_fstab_usr_options | mandatory }}\3' replace: '\1{{ evolinux_fstab_usr_options | mandatory }}\3'
when: when:
- "' /usr ' in fstab_content.stdout" - fstab_content.stdout | regex_search('\s/usr\s')
- evolinux_fstab_usr - evolinux_fstab_usr
- name: /var partition is customized - name: /var partition is customized
@ -44,7 +44,7 @@
replace: '\1{{ evolinux_fstab_var_options | mandatory }}\3' replace: '\1{{ evolinux_fstab_var_options | mandatory }}\3'
notify: remount /var notify: remount /var
when: when:
- "' /var ' in fstab_content.stdout" - fstab_content.stdout | regex_search('\s/var\s')
- evolinux_fstab_var - evolinux_fstab_var
- name: /var/tmp is created - name: /var/tmp is created