haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

guests/linux: public key insertion is more robust 

contents can have newlines (or not)
This commit is contained in:
Mitchell Hashimoto 2014-02-12 22:11:33 -08:00
parent 8bfb4bda2b
commit e909b91bfd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/guests/linux/cap/insert_public_key.rb
View File

@ -5,13 +5,13 @@ module VagrantPlugins
module Cap module Cap
class InsertPublicKey class InsertPublicKey
def self.insert_public_key(machine, contents) def self.insert_public_key(machine, contents)
contents = contents.chomp
contents = Vagrant::Util::ShellQuote.escape(contents, "'") contents = Vagrant::Util::ShellQuote.escape(contents, "'")
contents = contents.gsub("\n", "\\n")
machine.communicate.tap do |comm| machine.communicate.tap do |comm|
comm.execute("mkdir -p ~/.ssh") comm.execute("mkdir -p ~/.ssh")
comm.execute("chmod 0700 ~/.ssh") comm.execute("chmod 0700 ~/.ssh")
comm.execute("printf '#{contents}' >> ~/.ssh/authorized_keys") comm.execute("printf '#{contents}\\n' >> ~/.ssh/authorized_keys")
comm.execute("chmod 0600 ~/.ssh/authorized_keys") comm.execute("chmod 0600 ~/.ssh/authorized_keys")
end end
end end