Fix mkfs.vfat support (no -q)
This commit is contained in:
parent
e32f2110ab
commit
e7fa238b2a
2 changed files with 29 additions and 28 deletions
|
@ -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"
|
||||
|
|
|
@ -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á)
|
||||
|
|
Loading…
Reference in a new issue