susi-qemu 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bc88655a9b5207f858886dacd6c466036b42747a3d382d2ea76b2feb0803d82
-  data.tar.gz: 98c59659a0aca9366eab87caef03a5cabcf756b9492905da41bcb6e288b6aec7
+  metadata.gz: bcd6b80ed80898c41c3ca6365ff62561c8dd6f6959e2bf0082ff2d30b30c0c49
+  data.tar.gz: 69b8b5eea4153430e9af7540fafd5a4b6a46ffb60bb2ec39e54aeae5a1bb5d19
 SHA512:
-  metadata.gz: 3d9101294ba6ac775992dc889c4fe3b39591ddcb78d13665ab7368fcc3f9c7a8abd0a4b9753cae44feb76b204535cdd4df067f42289638835da032935c73e686
-  data.tar.gz: 65716f78fe4b5b4fa5a55aeaef70c7b2e462800d6c0f204c59e866e5ccf15224a42e0af96299e9392ade4d35e223625e05b6abe5e5678a608fd2b012c92a1450
+  metadata.gz: bcc80bdf535557fbc66257725635857521084b4574f2a58938c647bdfd3cdd79966235ce98373e163424b70120ba5c812651b007dabfbf94351b27bdb4fee9a4
+  data.tar.gz: e63022c2205e0405749e9c5339098d2818c270a0d783de626f076a57e4ab1e47f286cef7519c91b1e10240b016e3b307544b83b40bec21b2d88b968c09914fcf

data/lib/output.rb

@@ -1,5 +1,5 @@
 module Susi
-  DEBUG = false
+  DEBUG = true
 
   def self.debug(msg)
     puts msg if DEBUG

data/lib/ssh.rb

@@ -13,8 +13,9 @@ module Susi
     def self.set_hostname(name)
       vm = VM.new(name)
       Net::SSH.start(vm.ip, 'dabo', port: vm.ssh_port, keys: [File.expand_path('~/.ssh/id_ed25519')]) do |ssh|
-        Susi::debug "setting up VM..."
+        Susi::debug "Setting up VM..."
         ssh.exec!("sudo hostnamectl set-hostname #{name}")
+        ssh.exec!("sudo sed -i 's/susi/#{name}/' /etc/hosts")
       end
     end
   end

data/lib/susi.rb

@@ -50,6 +50,7 @@ YAML
     config = YAML.load_file(CONFIG_FILE)
     id = config['id']
     name = config['name'] || Dir.pwd.split('/').last
+    usb = config['usb']
     disk_template = "#{TEMPLATE_DIR}/#{config['template']}"
 
     # check if vm is already running
@@ -63,12 +64,12 @@ YAML
       Susi::debug "Disk not found, cloning..."
       Disk.clone(disk_template, disk_name)
 
-      VM.start(name, disk_name)
+      VM.start(name, disk_name, usb: usb)
 
       # SSH into VM and set hostname
       SSH.set_hostname(name)
     else
-      VM.start(name, disk_name)
+      VM.start(name, disk_name, usb: usb)
     end
   end
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Susi
-  VERSION = '0.0.6'
+  VERSION = '0.0.8'
 end

data/lib/vm.rb

@@ -122,7 +122,7 @@ module Susi
       raise "No free port found in range #{start_port}..#{end_port}"
     end
 
-    def self.start(name, disk, cdrom: nil)
+    def self.start(name, disk, cdrom: nil, usb: nil)
       qmp_port = self.get_free_port(4000, 4099)
       ssh_port = self.get_free_port(2000, 2099)
       vnc_port = self.get_free_port(5900, 5999)
@@ -133,12 +133,13 @@ module Susi
 
       cmd = []
 
-      cmd << "qemu-system-x86_64"
+      cmd << "sudo"
+      cmd << `which qemu-system-x86_64`.strip
 
       # general setup
       cmd << "-name #{name}"
       cmd << "-m 2048"
-      cmd << "-hda #{disk}.qcow2"
+      cmd << "-hda #{File.expand_path(disk)}.qcow2"
       cmd << "-daemonize"
       cmd << "-enable-kvm"
 
@@ -154,6 +155,14 @@ module Susi
         cmd << "-cdrom #{cdrom}"
       end
 
+      if usb
+        cmd << "-device qemu-xhci"
+        usb.each do |usbstr|
+          vendor, product = usbstr.split(':')
+          cmd << "-device usb-host,vendorid=0x#{vendor},productid=0x#{product}"
+        end
+      end
+
       cmd = cmd.join(" ")
       Susi::debug cmd
       system(cmd)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: susi-qemu
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - Daniel Bovensiepen