Merge branch 'master' into core-testing

slapos.cfg.example

@@ -42,5 +42,7 @@ alias =
   mariadb http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.16:/software/mariadb/software.cfg
   memcached http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.16:/software/memcached/software.cfg
   kumofs http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.21:/software/kumofs/software.cfg
-  erp5 http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/erp5/software.cfg
+  erp5 http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.30:/software/erp5/software.cfg
   erp5_branch http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/erp5:/software/erp5/software.cfg
+  vifib http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.30:/software/vifib/software.cfg
+

slapos/format.py

@@ -211,7 +211,7 @@ class Computer:
 
     # all addresses on interface are for partition, so lets add new one
     computer_tap = Tap('compdummy')
-    computer_tap.createWithOwner('root', attach_to_tap=True)
+    computer_tap.createWithOwner(User('root'), attach_to_tap=True)
     self.bridge.addTap(computer_tap)
     return self.bridge.addAddr()