Merge "improve mkfs condition and make fs_type for partitioning optional"
diff --git a/linux/storage/disk.sls b/linux/storage/disk.sls
index f6c70c5..493b8df 100644
--- a/linux/storage/disk.sls
+++ b/linux/storage/disk.sls
@@ -31,7 +31,9 @@
- name: partition.mkpart
- device: {{ disk_name }}
- part_type: primary
+ {%- if partition.type is defined %}
- fs_type: {{ partition.type }}
+ {%- endif %}
- start: {{ end_size }}MB
- end: {{ end_size + partition.size }}MB
- unless: "blkid {{ disk_name }}{{ loop.index }} {{ disk_name }}p{{ loop.index }}"
diff --git a/linux/storage/mount.sls b/linux/storage/mount.sls
index af77c26..90e9bd1 100644
--- a/linux/storage/mount.sls
+++ b/linux/storage/mount.sls
@@ -10,7 +10,7 @@
mkfs_{{ mount.device}}:
cmd.run:
- name: "mkfs.{{ mount.file_system }} -L {{ name }} {{ mount.device }}"
- - onlyif: "test `blkid {{ mount.device }} >/dev/null;echo $?` -eq 2"
+ - onlyif: "test `blkid {{ mount.device }} | grep -q TYPE;echo $?` -eq 1"
- require_in:
- mount: {{ mount.path }}
{%- if mount.file_system == 'xfs' %}