start netcapture before enabling hw accel refs #26945

5.MediaServer/3.Deploy_demokit/0_setup.py

@@ -25,7 +25,16 @@ def setup(interactive=True):
     with open('/etc/miris/netcapture.json', 'r') as f:
         c = json.load(f)
     c['campusmanager_check_ssl'] = False
+    with open('/etc/miris/netcapture.json', 'w') as f:
+        json.dump(c, f)
+
+    cmds.append('rsync -r mirisconf/ /etc/miris/conf')
+    # start netcapture without hw accel
+    if subprocess.getstatusoutput("netcapturectl ls") != 0:
+        cmds.append('netcapturectl add')
+    utils.run_commands(cmds)
 
+    cmds = list()
     # try to enable hw accel if available
     subprocess.getstatusoutput("apt install -y vainfo")
     if subprocess.getstatusoutput("vainfo")[0] == 0:
@@ -34,12 +43,6 @@ def setup(interactive=True):
         cmds.append('echo "options i915 enable_guc_loading=1 enable_guc_submission=1" > /etc/modprobe.d/netcapture.conf')
         cmds.append('update-initramfs -u')
         print('A reboot is required')
-
-    with open('/etc/miris/netcapture.json', 'w') as f:
-        json.dump(c, f)
-
-    cmds.append('rsync -r mirisconf/ /etc/miris/conf')
-    if subprocess.getstatusoutput("netcapturectl ls") != 0:
-        cmds.append('netcapturectl add')
-
+        with open('/etc/miris/netcapture.json', 'w') as f:
+            json.dump(c, f)
     utils.run_commands(cmds)