From e7fa238b2a95da17fc0c4e64f68cf2dcc050f756 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@feder.schottelius.org>
Date: Fri, 16 Jun 2017 05:30:40 +0200
Subject: [PATCH] Fix mkfs.vfat support (no -q)

---
 cdist/conf/type/__install_mkfs/gencode-remote | 56 +++++++++----------
 docs/changelog                                |  1 +
 2 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/cdist/conf/type/__install_mkfs/gencode-remote b/cdist/conf/type/__install_mkfs/gencode-remote
index 2fe680e5..da643cce 100755
--- a/cdist/conf/type/__install_mkfs/gencode-remote
+++ b/cdist/conf/type/__install_mkfs/gencode-remote
@@ -1,6 +1,7 @@
 #!/bin/sh
 #
 # 2011-2013 Steven Armstrong (steven-cdist at armstrong.cc)
+# 2017      Nico Schottelius (nico-cdist at schottelius.org)
 #
 # This file is part of cdist.
 #
@@ -22,32 +23,31 @@ device="$(cat "$__object/parameter/device")"
 type="$(cat "$__object/parameter/type")"
 
 case "$type" in
-   swap)
-      echo "mkswap $device"
-   ;;
-   xfs)
-      command="mkfs.xfs -f -q"
-      if [ -f "$__object/parameter/options" ]; then
-         options="$(cat "$__object/parameter/options")"
-         command="$command $options"
-      fi
-      command="$command $device"
-      if [ -f "$__object/parameter/blocks" ]; then
-         blocks="$(cat "$__object/parameter/blocks")"
-         command="$command $blocks"
-      fi
-      echo "$command"
-   ;;
-   *)
-      command="mkfs -t $type -q"
-      if [ -f "$__object/parameter/options" ]; then
-         options="$(cat "$__object/parameter/options")"
-         command="$command $options"
-      fi
-      command="$command $device"
-      if [ -f "$__object/parameter/blocks" ]; then
-         blocks="$(cat "$__object/parameter/blocks")"
-         command="$command $blocks"
-      fi
-      echo "$command"
+    swap)
+        echo "mkswap $device"
+        exit 0
+        ;;
+    xfs)
+        command="mkfs.xfs -f -q"
+        ;;
+
+    vfat)
+        command="mkfs.vfat"
+        ;;
+
+    *)
+        command="mkfs -t $type -q"
+        ;;
 esac
+
+if [ -f "$__object/parameter/options" ]; then
+    options="$(cat "$__object/parameter/options")"
+    command="$command $options"
+fi
+
+command="$command $device"
+if [ -f "$__object/parameter/blocks" ]; then
+    blocks="$(cat "$__object/parameter/blocks")"
+    command="$command $blocks"
+fi
+echo "$command"
diff --git a/docs/changelog b/docs/changelog
index 1631b997..15beba6b 100644
--- a/docs/changelog
+++ b/docs/changelog
@@ -3,6 +3,7 @@ Changelog
 
 next:
 	* Core: Support -j parallelization for object prepare and object run (Darko Poljak)
+	* Type __install_mkfs: mkfs.vfat does not support -q (Nico Schottelius)
 
 4.4.3: 2017-06-13
 	* Type __golang_from_vendor: Install golang from https://golang.org/dl/ (Kamila Součková)