From e76d2af3586508e90b24c85a625fae424f9faf85 Mon Sep 17 00:00:00 2001 From: Darko Poljak Date: Wed, 20 Apr 2016 08:13:47 +0200 Subject: [PATCH 1/2] Remove old style defaults. --- cdist/conf/type/__mount/parameter/default/options | 1 + cdist/conf/type/__mount/parameter/default/type | 1 + 2 files changed, 2 insertions(+) create mode 100644 cdist/conf/type/__mount/parameter/default/options create mode 100644 cdist/conf/type/__mount/parameter/default/type diff --git a/cdist/conf/type/__mount/parameter/default/options b/cdist/conf/type/__mount/parameter/default/options new file mode 100644 index 00000000..e94f8140 --- /dev/null +++ b/cdist/conf/type/__mount/parameter/default/options @@ -0,0 +1 @@ +defaults diff --git a/cdist/conf/type/__mount/parameter/default/type b/cdist/conf/type/__mount/parameter/default/type new file mode 100644 index 00000000..865faf10 --- /dev/null +++ b/cdist/conf/type/__mount/parameter/default/type @@ -0,0 +1 @@ +auto From 2ea85c773c20fab6cec5ca7b2391db3fade515ee Mon Sep 17 00:00:00 2001 From: Darko Poljak Date: Wed, 20 Apr 2016 08:14:44 +0200 Subject: [PATCH 2/2] Remove old style defaults. --- cdist/conf/type/__mount/manifest | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cdist/conf/type/__mount/manifest b/cdist/conf/type/__mount/manifest index 8a1fa234..472b6e2e 100755 --- a/cdist/conf/type/__mount/manifest +++ b/cdist/conf/type/__mount/manifest @@ -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")"