Merge remote-tracking branch 'deriamis/sshkey'

Conflicts:
	bin/lvmsync

Author: mpalmer

bin/lvmsync

@@ -28,7 +28,8 @@ include LVM::Helpers
 
 def main()
 	# Parse me some options
-	options = {}
+	options = { :rsh => "ssh" }
+
 	OptionParser.new do |opts|
 		opts.banner = "Usage: lvmsync [options]"
 		opts.separator ""
@@ -65,6 +66,10 @@ def main()
 			options[:source] = v
 		end
 
+		opts.on("-e", "--rsh <command-string>", "Use specified command when invoking SSH") do |v|
+			options[:rsh] = v
+		end
+
 		opts.on("-V", "--version", "Print version of lvmsync") do |v|
 			begin
 				puts "lvmsync #{GVB.version}"
@@ -210,7 +215,7 @@ def run_client(opts)
 	else
 		verbose = opts[:verbose] ? '-v' : ''
 		server_cmd = if desthost
-			"ssh #{desthost} lvmsync --apply - #{snapback} #{verbose} #{destdev}"
+			"#{opts[:rsh]} #{desthost} lvmsync --apply - #{snapback} #{verbose} #{destdev}"
 		else
 			"#{$0} --apply - #{snapback} #{verbose} #{destdev}"
 		end