2 files changed, 11 insertions, 1 deletions
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh
index 6c198b1d..e00e2498 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh
@@ -47,6 +47,7 @@ ExceptionGsettings2=101
 ExceptionGsettings3=102
 ExceptionNTS=103
 ExceptionProxy=104
+ExceptionGrub=105
 
 try
 (
@@ -58,11 +59,14 @@ try
     gsettings set org.gnome.desktop.screensaver lock-enabled false || throw $ExceptionGsettings2
     echo "Disable questions on shutdown."
     gsettings set com.canonical.indicator.session suppress-logout-restart-shutdown true || throw $ExceptionGsettings3
+    echo "Set grub timeout to 0"
+    sudo sed -i 's|GRUB_TIMEOUT=10|GRUB_TIMEOUT=0|g' /etc/default/grub || throw $ExceptionGrub
+    sudo update-grub || throw $ExceptionGrub
 
     echo "Set Network Test Server address to $NTS_IP in /etc/hosts"
     echo "$NTS_IP    qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts || throw $ExceptionNTS
 
-    if [ "$proxy" != "" ]; then
+    if [ "$http_proxy" != "" ]; then
         echo "Acquire::http::Proxy \"$proxy\";" | sudo tee -a /etc/apt/apt.conf || throw $ExceptionProxy
     fi
 )
@@ -84,6 +88,10 @@ catch || {
             echo "Failed to disable questions on shutdown."
             exit 1;
         ;;
+        $ExceptionGrub)
+            echo "Failed to set grub timeout."
+            exit 1;
+        ;;
         $ExceptionNTS)
             echo "Failed to set network teset server address into /etc/hosts."
             exit 1;
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh
index 73916cb3..e0e1d1f1 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh
@@ -99,6 +99,8 @@ try
     installPackages+=(libgstreamer-plugins-bad1.0-dev)
     # Support for cross-building to x86 (needed by WebEngine boot2qt builds)
     installPackages+=(g++-multilib)
+    # python2 development package
+    installPackages+=(python-pip)
     # python3 development package
     installPackages+=(python3-dev)
     installPackages+=(python3-pip)