forked from ungleich-public/cdist
		
	Merge branches 'install_integration' and 'preos' into 4.0-pre-not-stable
This commit is contained in:
		
				commit
				
					
						cb648fce33
					
				
			
		
					 2 changed files with 2 additions and 1 deletions
				
			
		| 
						 | 
					@ -58,7 +58,7 @@ case "$state_should" in
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        # Only replace ' with '"'"' and keep \ as they are
 | 
					        # Only replace ' with '"'"' and keep \ as they are
 | 
				
			||||||
        line_sanitised=$(cat "$__object/parameter/line" | sed -e "s/'/'\"'\"'/g")
 | 
					        line_sanitised=$(cat "$__object/parameter/line" | sed -e "s/'/'\"'\"'/g")
 | 
				
			||||||
        echo "printf '%s\n' '$line_sanitised' >> $file"
 | 
					        printf '%s' "printf '%s\n' '$line_sanitised' >> $file"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    ;;
 | 
					    ;;
 | 
				
			||||||
    absent)
 | 
					    absent)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -13,6 +13,7 @@ Changelog
 | 
				
			||||||
	* Core: Add environment variable to select shell for executing scripts (Daniel Heule)
 | 
						* Core: Add environment variable to select shell for executing scripts (Daniel Heule)
 | 
				
			||||||
	* Explorer hostname: Return host name by using uname -n
 | 
						* Explorer hostname: Return host name by using uname -n
 | 
				
			||||||
	* New Type: __hostname (Steven Armstrong)
 | 
						* New Type: __hostname (Steven Armstrong)
 | 
				
			||||||
 | 
						* Type __line: Use printf instead of echo for printing user input
 | 
				
			||||||
 | 
					
 | 
				
			||||||
3.0.2: 2014-01-19
 | 
					3.0.2: 2014-01-19
 | 
				
			||||||
	* Documentation: Document all messages sent by types (Daniel Heule)
 | 
						* Documentation: Document all messages sent by types (Daniel Heule)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue