From d2694d83a9cb66abb027f884582ba69b228580dc Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@feder.schottelius.org>
Date: Mon, 19 Jun 2017 11:03:04 +0200
Subject: [PATCH] backport  __install_mkfs from Steven

Signed-off-by: Nico Schottelius <nico@feder.schottelius.org>
---
 cdist/conf/type/__install_mkfs/gencode-remote | 72 +++++++++++--------
 1 file changed, 44 insertions(+), 28 deletions(-)

diff --git a/cdist/conf/type/__install_mkfs/gencode-remote b/cdist/conf/type/__install_mkfs/gencode-remote
index da643cce..c11689df 100755
--- a/cdist/conf/type/__install_mkfs/gencode-remote
+++ b/cdist/conf/type/__install_mkfs/gencode-remote
@@ -1,7 +1,6 @@
 #!/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.
 #
@@ -23,31 +22,48 @@ device="$(cat "$__object/parameter/device")"
 type="$(cat "$__object/parameter/type")"
 
 case "$type" in
-    swap)
-        echo "mkswap $device"
-        exit 0
-        ;;
-    xfs)
-        command="mkfs.xfs -f -q"
-        ;;
-
-    vfat)
-        command="mkfs.vfat"
-        ;;
-
-    *)
-        command="mkfs -t $type -q"
-        ;;
+   swap)
+      echo "mkswap -f $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"
+   ;;
+   vfat)
+      command="mkfs.vfat"
+      if [ -n "$fat_size" ]; then
+         command="$command -F $fat_size"
+      fi
+      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"
 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"