Merge branch 'qemuuser' of https://github.com/bmwiedemann/osc

openSUSE · Mar 1, 2016 · 84935cc · 84935cc
2 parents 6a33581 + bbefe02
commit 84935cc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/osc/build.py b/osc/build.py
@@ -1043,6 +1043,8 @@ def __str__(self):
             vm_options += [ '--vmdisk-swapsize=' + config['build-vmdisk-swapsize'] ]
         if config['build-vmdisk-filesystem']:
             vm_options += [ '--vmdisk-filesystem=' + config['build-vmdisk-filesystem'] ]
+        if config['build-vm-user']:
+            vm_options += [ '--vm-user=' + config['build-vm-user'] ]
 
 
     if opts.preload:

diff --git a/osc/conf.py b/osc/conf.py
@@ -113,6 +113,7 @@ def _get_processors():
             'build-vmdisk-rootsize': '',        # optional for VM builds
             'build-vmdisk-swapsize': '',        # optional for VM builds
             'build-vmdisk-filesystem': '',        # optional for VM builds
+            'build-vm-user': '',                # optional for VM builds
             'build-kernel': '',                 # optional for VM builds
             'build-initrd': '',                 # optional for VM builds