Disable qxl for QEMU, tidy up scripts

debian.json

@@ -101,33 +101,30 @@
 	},
         {
             "scripts": [
-                "scripts/update.sh",
                 "scripts/zerodisk.sh"
             ],
             "type": "shell"
         },
         {
             "scripts": [
-                "scripts/packages.sh"
+                "scripts/packages.sh",
+                "scripts/fixesQEMU.sh"
             ],
             "type": "shell",
             "only": ["debian-qemu"]
         },
-        {
-            "inline": ["printf '\nauto enp0s3\niface enp0s3 inet dhcp\n\n' >> /etc/network/interfaces"],
-            "type": "shell",
-            "only": ["debian-vbox"]
-        },
         {
             "scripts": [
                 "scripts/addVagrantUser.sh",
-                "scripts/guestAdditions.sh"
+                "scripts/guestAdditions.sh",
+                "scripts/fixesVBox.sh"
             ],
             "type": "shell",
             "only": ["debian-vbox"]
         },
         {
             "scripts": [
+                "scripts/fixes.sh",
                 "scripts/cleanup.sh"
             ],
             "type": "shell"

scripts/cleanup.sh

 #!/bin/bash -x
 
-# set GRUB_TIMEOUT to 0
-sudo sed -i "s/^GRUB_TIMEOUT=[0-9]*/GRUB_TIMEOUT=0/" /etc/default/grub
-sudo update-grub
-
-# disable root login using password
-sudo passwd -l root
-
 # cleanup
 apt-get -y autoremove
 apt-get -y autoclean

scripts/fixes.sh

+#!/bin/sh -x
+
+# apt update
+DEBIAN_FRONTEND=noninteractive sudo apt-get update
+
+# set GRUB_TIMEOUT to 0
+sudo sed -i "s/^GRUB_TIMEOUT=[0-9]*/GRUB_TIMEOUT=0/" /etc/default/grub
+sudo update-grub
+
+# disable root login using password
+sudo passwd -l root
+

scripts/fixesQEMU.sh

+#!/bin/sh -x
+
+# disable qxl
+lsmod | grep "^qxl" > /dev/null
+if [ $? -eq 0 ] ; then
+    sudo sed -i 's/^GRUB_CMDLINE_LINUX_DEFAULT=\"\(.*\)\"/GRUB_CMDLINE_LINUX_DEFAULT=\"\1 qxl.modeset=0\"/g' /etc/default/grub
+    sudo update-grub
+fi
+

scripts/fixesVBox.sh

+#!/bin/sh -x
+
+# fix networking issue
+printf '\nauto enp0s3\niface enp0s3 inet dhcp\n\n' >> /etc/network/interfaces
+

scripts/update.sh

-#!/bin/sh -x
-
-# update
-
-DEBIAN_FRONTEND=noninteractive sudo apt-get update
-