qemu-toolkit 0.3.1 → 0.3.3

data/doc/README.7

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "QEMU\-TOOLKIT" "7" "November 2012" "" "qemu-toolkit"
+.TH "QEMU\-TOOLKIT" "7" "December 2012" "" "qemu-toolkit"
 .
 .SH "NAME"
 \fBqemu\-toolkit\fR \- A toolkit for running qemu on Illumos / OmniOS

data/doc/qemu-toolkit-configuration.7

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "QEMU\-TOOLKIT\-CONFIGURATION" "7" "November 2012" "" "qemu-toolkit"
+.TH "QEMU\-TOOLKIT\-CONFIGURATION" "7" "December 2012" "" "qemu-toolkit"
 .
 .SH "NAME"
 \fBqemu\-toolkit\-configuration\fR \- configuration for qemu\-toolkit
@@ -97,6 +97,37 @@ drive if: \'floppy\', file: \'floppy\.dsk\'
 .
 .IP "" 0
 
+.
+.TP
+keyboard_layout \fILAYOUT\fR
+Configure keyboard layout of the VNC display\. The default is \'en\-us\'\.
+.
+.IP "" 4
+.
+.nf
+
+# Set keyboard to \'de\-ch\'
+keyboard_layout \'de\-ch\'
+.
+.fi
+.
+.IP "" 0
+.
+.IP
+The available layouts are:
+.
+.IP "" 4
+.
+.nf
+
+ar  de\-ch  es  fo     fr\-ca  hu  ja  mk     no  pt\-br  sv
+da  en\-gb  et  fr     fr\-ch  is  lt  nl     pl  ru     th
+de  en\-us  fi  fr\-be  hr     it  lv  nl\-be  pt  sl     tr
+.
+.fi
+.
+.IP "" 0
+
 .
 .TP
 net \fITYPE\fR, \fIOPTIONS\fR
@@ -166,12 +197,14 @@ Enables VNC server on port \fIPORT\fR\. Caution: This will listen for connection
 .nf
 
 # Make vnc listen on a given port: (5900 + display = tcp/ip port)
-vnc_display 0
+vnc_display ":0"
 .
 .fi
 .
 .IP "" 0
-
+.
+.IP
+This option is passed through to the \'\-vnc\' option on qemu\. All the values permitted there are permitted here as well\. Note that a vnc socket is created in \fB/var/run/qemu\-toolkit/VMNAME/vm\.vnc\fR even if this option is not given\.
 .
 .TP
 extra_arg \fIARGUMENT\fR

data/doc/qemu-toolkit-configuration.7.ronn

@@ -60,6 +60,18 @@ Here's a list of configuration options within the virtual_machine declaration:
         # Manual drive configuration:
         drive if: 'floppy', file: 'floppy.dsk'
         
+  * keyboard_layout <LAYOUT>:
+    Configure keyboard layout of the VNC display. The default is 'en-us'. 
+    
+        # Set keyboard to 'de-ch'
+        keyboard_layout 'de-ch'
+        
+    The available layouts are: 
+        
+        ar  de-ch  es  fo     fr-ca  hu  ja  mk     no  pt-br  sv
+        da  en-gb  et  fr     fr-ch  is  lt  nl     pl  ru     th
+        de  en-us  fi  fr-be  hr     it  lv  nl-be  pt  sl     tr
+        
   * net <TYPE>, <OPTIONS>:
     Manual network configuration. This gives you full access to QEMU options, 
     with the disadvantage of a slightly more complicated set of options. 
@@ -106,7 +118,12 @@ Here's a list of configuration options within the virtual_machine declaration:
     console` or connect directly to the unix socket using socat.
     
         # Make vnc listen on a given port: (5900 + display = tcp/ip port)
-        vnc_display 0
+        vnc_display ":0"
+        
+    This option is passed through to the '-vnc' option on qemu. All the values
+    permitted there are permitted here as well. Note that a vnc socket is 
+    created in `/var/run/qemu-toolkit/VMNAME/vm.vnc` even if this option is 
+    not given. 
 
   * extra_arg <ARGUMENT>:
     Extra argument for QEMU, appended to the QEMU command line on launch. If

data/lib/qemu-toolkit/dsl.rb

@@ -42,6 +42,9 @@ module QemuToolkit
           binding, 
           path)
       end
+      def require file
+        Kernel.require file
+      end
       def add_toplevel_target target, producer
         define_singleton_method(target) { |*args, &block| 
           object = producer.call(*args) 

data/lib/qemu-toolkit/vm.rb

@@ -14,6 +14,11 @@ module QemuToolkit
       #
       def all(backend=nil)
         Enumerator.new do |yielder|
+          libdir = Config.etc('lib')
+          if ::File.directory? libdir
+            $:.unshift libdir
+          end
+          
           Dir[Config.etc('*.rb')].each do |vm_file|
             # Load all virtual machines from the given file
             dsl = DSL::File.new
@@ -52,6 +57,8 @@ module QemuToolkit
     attr_accessor :ram
     # VNC display port
     attr_accessor :vnc_display
+    # Keyboard layout
+    attr_accessor :keyboard_layout
     
     def initialize(backend)
       @disks = []
@@ -110,10 +117,13 @@ module QemuToolkit
       cmd << "-no-hpet"
       cmd << "-enable-kvm"
       cmd << "-vga cirrus"
-      cmd << "-k de-ch"
       cmd << "-parallel none"
       cmd << "-usb"
       cmd << '-usbdevice tablet'
+      
+      if keyboard_layout
+        cmd << "-k #{keyboard_layout}"
+      end
 
       # Add disks
       cmd += disk_options

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qemu-toolkit
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-10 00:00:00.000000000 Z
+date: 2012-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp