remember default __remote_{copy,exec} so we can use it ourself in custom __remote_{copy,exec} scripts
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
This commit is contained in:
		
					parent
					
						
							
								04c8415060
							
						
					
				
			
			
				commit
				
					
						0114001627
					
				
			
		
					 3 changed files with 4 additions and 2 deletions
				
			
		| 
						 | 
					@ -41,6 +41,6 @@ log "@: $@"
 | 
				
			||||||
log "code: $code"
 | 
					log "code: $code"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# copy files into chroot
 | 
					# copy files into chroot
 | 
				
			||||||
$__remote_copy $code
 | 
					$__default_remote_copy $code
 | 
				
			||||||
 | 
					
 | 
				
			||||||
log "-----"
 | 
					log "-----"
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -44,6 +44,6 @@ log "@: $@"
 | 
				
			||||||
log "code: $code"
 | 
					log "code: $code"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Run the code
 | 
					# Run the code
 | 
				
			||||||
$__remote_exec $target_host $code
 | 
					$__default_remote_exec $target_host $code
 | 
				
			||||||
 | 
					
 | 
				
			||||||
log "-----"
 | 
					log "-----"
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -39,6 +39,8 @@ case "$__cdist_loglevel" in
 | 
				
			||||||
esac
 | 
					esac
 | 
				
			||||||
 | 
					
 | 
				
			||||||
cat << DONE
 | 
					cat << DONE
 | 
				
			||||||
 | 
					export __default_remote_exec="$__remote_exec"
 | 
				
			||||||
 | 
					export __default_remote_copy="$__remote_copy"
 | 
				
			||||||
cdist config \
 | 
					cdist config \
 | 
				
			||||||
   $cdist_args \
 | 
					   $cdist_args \
 | 
				
			||||||
   --remote-exec="$remote_exec $chroot" \
 | 
					   --remote-exec="$remote_exec $chroot" \
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue