deal with that stinkin cdist marker thinggy

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
remotes/origin/fix-j
Steven Armstrong 10 years ago
parent f97e6c42c7
commit bb62787c7c
  1. 2
      cdist/conf/type/__install_generate_fstab/gencode-local
  2. 2
      cdist/conf/type/__install_partition_msdos_apply/gencode-remote

@ -25,7 +25,7 @@ mkdir "$__object/files"
# get current UUID's from target_host
$__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" -path "*.cdist-*"); do
device="$(cat "$object/parameter/device")"
dir="$(cat "$object/parameter/dir")"
prefix="$(cat "$object/parameter/prefix")"

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

Loading…
Cancel
Save