tom/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix mkfs.vfat support (no -q)

Browse source
This commit is contained in:
Nico Schottelius 2017-06-16 05:30:40 +02:00
parent e32f2110ab
commit e7fa238b2a
2 changed files with 29 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
cdist/conf/type/__install_mkfs/gencode-remote
View file

@ -1,6 +1,7 @@
#!/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.
# #
@ -22,32 +23,31 @@ 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 $device"
;; exit 0
xfs) ;;
command="mkfs.xfs -f -q" xfs)
if [ -f "$__object/parameter/options" ]; then command="mkfs.xfs -f -q"
options="$(cat "$__object/parameter/options")" ;;
command="$command $options"
fi vfat)
command="$command $device" command="mkfs.vfat"
if [ -f "$__object/parameter/blocks" ]; then ;;
blocks="$(cat "$__object/parameter/blocks")"
command="$command $blocks" *)
fi command="mkfs -t $type -q"
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"

1
docs/changelog
View file

@ -3,6 +3,7 @@ Changelog
next: next:
* Core: Support -j parallelization for object prepare and object run (Darko Poljak) * 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 4.4.3: 2017-06-13
* Type __golang_from_vendor: Install golang from https://golang.org/dl/ (Kamila Součková) * Type __golang_from_vendor: Install golang from https://golang.org/dl/ (Kamila Součková)