forked from ungleich-public/cdist
		
	update cdist-manifest-run-init to argc==1 as well
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
		
					parent
					
						
							
								26eb50c89c
							
						
					
				
			
			
				commit
				
					
						4c36c7dddb
					
				
			
		
					 2 changed files with 4 additions and 8 deletions
				
			
		| 
						 | 
					@ -43,14 +43,11 @@ echo "cdist $__cdist_version: Configuring $__cdist_target_host"
 | 
				
			||||||
__cdist_init_deploy           "$__cdist_target_host"
 | 
					__cdist_init_deploy           "$__cdist_target_host"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Transfer cdist executables
 | 
					# Transfer cdist executables
 | 
				
			||||||
echo "Transferring cdist binaries ...X"
 | 
					echo "Transferring cdist binaries ..."
 | 
				
			||||||
cdist-dir push "$__cdist_target_host" "${__cdist_abs_mydir}" "${__cdist_remote_bin_dir}"
 | 
					cdist-dir push "$__cdist_target_host" "${__cdist_abs_mydir}" "${__cdist_remote_bin_dir}"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Execute general explorers
 | 
					 | 
				
			||||||
cdist-explorer-run-global     "$__cdist_target_host"
 | 
					cdist-explorer-run-global     "$__cdist_target_host"
 | 
				
			||||||
 | 
					cdist-manifest-run-init       "$__cdist_target_host"
 | 
				
			||||||
# Create initial object base
 | 
					 | 
				
			||||||
cdist-manifest-run-init       "$__cdist_target_host" "$__cdist_out_object_dir"
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Create dependent objects
 | 
					# Create dependent objects
 | 
				
			||||||
cdist-manifest-run-all        "$__cdist_target_host" "$__cdist_out_object_dir"
 | 
					cdist-manifest-run-all        "$__cdist_target_host" "$__cdist_out_object_dir"
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -23,13 +23,12 @@
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
 | 
					
 | 
				
			||||||
. cdist-config
 | 
					. cdist-config
 | 
				
			||||||
[ $# -eq 2 ] || __cdist_usage "<target host> <outdir>"
 | 
					[ $# -eq 1 ] || __cdist_usage "<target host>"
 | 
				
			||||||
set -e
 | 
					set -e
 | 
				
			||||||
 | 
					
 | 
				
			||||||
__cdist_target_host="$1"; shift
 | 
					__cdist_target_host="$1"; shift
 | 
				
			||||||
__cdist_output_dir="$1"; shift
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
eval export $__cdist_name_var_manifest=\"\$__cdist_manifest_dir\"
 | 
					eval export $__cdist_name_var_manifest=\"\$__cdist_manifest_dir\"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
echo "Running initial manifest for $__cdist_target_host ..."
 | 
					echo "Running initial manifest for $__cdist_target_host ..."
 | 
				
			||||||
cdist-manifest-run "$__cdist_target_host" "$__cdist_manifest_init" "$__cdist_output_dir"
 | 
					cdist-manifest-run "$__cdist_target_host" "$__cdist_manifest_init" "$__cdist_out_object_dir"
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue