backport __install_mkfs from Steven

Signed-off-by: Nico Schottelius <nico@feder.schottelius.org>
This commit is contained in:
Nico Schottelius 2017-06-19 11:03:04 +02:00
parent f70a4acbb9
commit d2694d83a9

View file

@ -1,7 +1,6 @@
#!/bin/sh #!/bin/sh
# #
# 2011-2013 Steven Armstrong (steven-cdist at armstrong.cc) # 2011-2013 Steven Armstrong (steven-cdist at armstrong.cc)
# 2017 Nico Schottelius (nico-cdist at schottelius.org)
# #
# This file is part of cdist. # This file is part of cdist.
# #
@ -23,31 +22,48 @@ device="$(cat "$__object/parameter/device")"
type="$(cat "$__object/parameter/type")" type="$(cat "$__object/parameter/type")"
case "$type" in case "$type" in
swap) swap)
echo "mkswap $device" echo "mkswap -f $device"
exit 0 ;;
;; xfs)
xfs) command="mkfs.xfs -f -q"
command="mkfs.xfs -f -q" if [ -f "$__object/parameter/options" ]; then
;; options="$(cat "$__object/parameter/options")"
command="$command $options"
vfat) fi
command="mkfs.vfat" command="$command $device"
;; if [ -f "$__object/parameter/blocks" ]; then
blocks="$(cat "$__object/parameter/blocks")"
*) command="$command $blocks"
command="mkfs -t $type -q" 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 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"