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

deal with that stinkin cdist marker thinggy

Browse source 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
This commit is contained in:
Steven Armstrong 2015-07-10 16:36:02 +02:00
parent bb62787c7c
commit 9ad203c744
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cdist/conf/type/__install_generate_fstab/gencode-local
View file

@ -25,7 +25,7 @@ mkdir "$__object/files"
# get current UUID's from target_host # get current UUID's from target_host
$__remote_exec $__target_host blkid > "$__object/files/blkid" $__remote_exec $__target_host blkid > "$__object/files/blkid"
for object in $(find "$__global/object/__install_mount" -path "*.cdist-*"); do for object in $(find "$__global/object/__install_mount" -type d -name "$__cdist_object_marker"); do
device="$(cat "$object/parameter/device")" device="$(cat "$object/parameter/device")"
dir="$(cat "$object/parameter/dir")" dir="$(cat "$object/parameter/dir")"
prefix="$(cat "$object/parameter/prefix")" prefix="$(cat "$object/parameter/prefix")"

2
cdist/conf/type/__install_partition_msdos_apply/gencode-remote
View file

@ -57,7 +57,7 @@ size_to_mb() {
get_objects() { get_objects() {
objects_file=$(mktemp) objects_file=$(mktemp)
for object in $(find "$__global/object/__install_partition_msdos" -path "*.cdist-*"); do for object in $(find "$__global/object/__install_partition_msdos" -type d -name "$__cdist_object_marker"); do
object_device="$(cat "$object/parameter/device")" object_device="$(cat "$object/parameter/device")"
object_minor="$(cat "$object/parameter/minor")" object_minor="$(cat "$object/parameter/minor")"
echo "$object_device $object_minor $object" >> $objects_file echo "$object_device $object_minor $object" >> $objects_file