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

Rm old style defaults
remotes/origin/4.0
Nico Schottelius 9 years ago
commit 96dc99c389
  1. 4
      cdist/conf/type/__mount/manifest
  2. 1
      cdist/conf/type/__mount/parameter/default/options
  3. 1
      cdist/conf/type/__mount/parameter/default/type

@ -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")"

Loading…
Cancel
Save