From fe16be040883d411d395884f42ae462711e60ce2 Mon Sep 17 00:00:00 2001
From: Wei Zhou <weizhou@apache.org>
Date: Wed, 7 Sep 2022 07:43:45 +0200
Subject: [PATCH 1/3] UI: fix bulk delete project with cleanup (#6708)

---
 ui/src/config/section/project.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/config/section/project.js b/ui/src/config/section/project.js
index ee8f2359b9a..a9bfb954647 100644
--- a/ui/src/config/section/project.js
+++ b/ui/src/config/section/project.js
@@ -158,7 +158,7 @@ export default {
       },
       groupAction: true,
       popup: true,
-      groupMap: (selection) => { return selection.map(x => { return { id: x } }) },
+      groupMap: (selection, values) => { return selection.map(x => { return { id: x, cleanup: values.cleanup || null } }) },
       args: (record, store) => {
         const fields = []
         if (store.apis.deleteProject.params.filter(x => x.name === 'cleanup').length > 0) {

From f342cf300ee491f09ccb66307979fda983db3c22 Mon Sep 17 00:00:00 2001
From: David Jumani <dj.davidjumani1994@gmail.com>
Date: Wed, 7 Sep 2022 12:25:23 +0530
Subject: [PATCH 2/3] ui: Fix netowrkid not passed in deployvm (#6711)

Fixes the issue of the networkid not being passed when deploying a VM
This is caused when the first template selected is a deploy-as-is one and the nicToNetworkSelection not being reset when selecting a new template
---
 ui/src/views/compute/DeployVM.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/views/compute/DeployVM.vue b/ui/src/views/compute/DeployVM.vue
index 1566806883d..39946eeabc8 100644
--- a/ui/src/views/compute/DeployVM.vue
+++ b/ui/src/views/compute/DeployVM.vue
@@ -2158,6 +2158,7 @@ export default {
     },
     fetchTemplateNics (template) {
       var nics = []
+      this.nicToNetworkSelection = []
       if (template && template.deployasisdetails && Object.keys(template.deployasisdetails).length > 0) {
         var keys = Object.keys(template.deployasisdetails)
         keys = keys.filter(key => key.startsWith('network-'))
@@ -2169,7 +2170,6 @@ export default {
           return a.InstanceID - b.InstanceID
         })
         if (this.options.networks && this.options.networks.length > 0) {
-          this.nicToNetworkSelection = []
           for (var i = 0; i < nics.length; ++i) {
             var nic = nics[i]
             nic.id = nic.InstanceID

From d3bfdacffd1223dbc721f6f006cac26dbe9f98e3 Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhishek.mrt22@gmail.com>
Date: Wed, 7 Sep 2022 13:42:57 +0530
Subject: [PATCH 3/3] systemvm,vr: disable radvd for non-applicable VRs (#6706)

Fixes #6700

When VR is a DHCP server system VM type then stop radvd.
---
 systemvm/debian/opt/cloud/bin/setup/dhcpsrvr.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/systemvm/debian/opt/cloud/bin/setup/dhcpsrvr.sh b/systemvm/debian/opt/cloud/bin/setup/dhcpsrvr.sh
index 27dbf3e8f62..0f65f304f36 100755
--- a/systemvm/debian/opt/cloud/bin/setup/dhcpsrvr.sh
+++ b/systemvm/debian/opt/cloud/bin/setup/dhcpsrvr.sh
@@ -39,6 +39,10 @@ setup_dhcpsrvr() {
   sed -i "s/-A INPUT -i eth0 -p udp -m udp --dport 53 -j ACCEPT/-A INPUT -i eth0 -p udp -m udp --dport 53 -s $DHCP_RANGE\/$CIDR_SIZE -j ACCEPT/g" /etc/iptables/rules.v4
   sed -i "s/-A INPUT -i eth0 -p tcp -m tcp --dport 53 -j ACCEPT/-A INPUT -i eth0 -p tcp -m tcp --dport 53 -s $DHCP_RANGE\/$CIDR_SIZE -j ACCEPT/g" /etc/iptables/rules.v4
 
+  log_it "Disable radvd for dhcp server system vm"
+  rm -rf /etc/radvd.conf
+  systemctl stop radvd
+  systemctl disable radvd
 }
 
 dhcpsrvr_svcs