From 8aab2688e1f8c917daef48c3a31522fbd24e7d47 Mon Sep 17 00:00:00 2001
From: Chenxiong Qi <cqi@redhat.com>
Date: Nov 07 2018 04:04:13 +0000
Subject: [PATCH 1/2] Fix incorrect username appended to mock group


Signed-off-by: Chenxiong Qi <cqi@redhat.com>

---

diff --git a/Vagrantfile b/Vagrantfile
index 88b505d..9cbafa7 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -98,7 +98,7 @@ Vagrant.configure("2") do |config|
   config.vm.network "forwarded_port", guest_ip: "0.0.0.0", guest: 5000, host: 5000
   config.vm.network "forwarded_port", guest_ip: "0.0.0.0", guest: 13747, host: 13747
   config.vm.provision "shell", inline: $script
-  config.vm.provision "shell", inline: "usermod -a -G mock Vagrant"
+  config.vm.provision "shell", inline: "usermod -a -G mock vagrant"
   config.vm.provision "shell", inline: $make_devenv, privileged: false
   config.vm.provision "shell", inline: $script_services, privileged: false, run: "always"
   config.vm.provider "libvirt" do |v, override|

From d6407ac5fbe13eaf929e26b502afa1312382f94e Mon Sep 17 00:00:00 2001
From: Chenxiong Qi <cqi@redhat.com>
Date: Nov 07 2018 04:04:22 +0000
Subject: [PATCH 2/2] Make directory /etc/module-build-service instead of link


rhpkg could be installed inside Vagrant machine to run MBS with internal
infra. rhpkg installs config file into /etc/module-build-service, which
could fail with following error if /etc/module-build-service is a link
to /opt/module_build_service/conf.

error: unpacking of archive failed on file
/etc/module-build-service/redhat.py;5be25ac4: cpio: chown

Signed-off-by: Chenxiong Qi <cqi@redhat.com>

---

diff --git a/Vagrantfile b/Vagrantfile
index 9cbafa7..129695f 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -48,9 +48,9 @@ $script = <<SCRIPT
         wget \
         which
 
-    if [ ! -e /etc/module-build-service ]; then
-        ln -s /opt/module_build_service/conf /etc/module-build-service
-    fi
+    mbs_config_dir=/etc/module-build-service
+    [ -e "$mbs_config_dir" ] || mkdir "$mbs_config_dir"
+    cp -r /opt/module_build_service/conf/* "$mbs_config_dir"
 SCRIPT
 
 $make_devenv = <<DEVENV