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

Merge pull request #431 from darko-poljak/rm-old-style-defaults

Browse source 
Rm old style defaults
This commit is contained in:
Nico Schottelius 2016-04-21 06:54:34 +02:00
commit 96dc99c389
3 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cdist/conf/type/__mount/manifest
View file

@ -26,9 +26,9 @@ if [ ! -f "$__object/parameter/nofstab" ]; then
(
printf "%s" "$(cat "$__object/parameter/device")"
printf " %s" "$path"
type="$(cat "$__object/parameter/type" 2>/dev/null || echo "auto")"
type="$(cat "$__object/parameter/type")"
printf " %s" "$type"
options="$(cat "$__object/parameter/options" 2>/dev/null || echo "defaults")"
options="$(cat "$__object/parameter/options")"
printf " %s" "$options"
printf " %s" "$(cat "$__object/parameter/dump")"
printf " %s\n" "$(cat "$__object/parameter/pass")"

1
cdist/conf/type/__mount/parameter/default/options Normal file
View file

@ -0,0 +1 @@
defaults

1
cdist/conf/type/__mount/parameter/default/type Normal file
View file

@ -0,0 +1 @@
auto