From 06687c35494690bf0309c89ef0237d42a10ff1eb Mon Sep 17 00:00:00 2001
From: cimryan <cimryan@users.noreply.github.com>
Date: Sat, 3 Nov 2018 18:38:38 -0700
Subject: [PATCH 1/4] Upgrade packages during setup.

---
 setup/pi/setup-teslausb | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/setup/pi/setup-teslausb b/setup/pi/setup-teslausb
index ea27441..3b18fdc 100644
--- a/setup/pi/setup-teslausb
+++ b/setup/pi/setup-teslausb
@@ -191,9 +191,19 @@ function make_root_fs_readonly () {
   /tmp/make-root-fs-readonly.sh
 }
 
+function upgrade_packages () {
+  setup_progress "Updating package index files..."
+  apt-get update
+  
+  setup_progress "Upgrading installed packages..."
+  apt-get --assume-yes upgrade
+}
+
 export -f setup_progress
 export HEADLESS_SETUP
 
+upgrade_packages
+
 headless_setup_populate_variables
 
 # If USE_LED_FOR_SETUP_PROGRESS = true. 

From 7b314108020b88f9e8e5380b1ad6e2afce5af323 Mon Sep 17 00:00:00 2001
From: cimryan <cimryan@users.noreply.github.com>
Date: Sat, 3 Nov 2018 18:38:58 -0700
Subject: [PATCH 2/4] Elminate redundant update in make-root-fs-readonly

---
 setup/pi/make-root-fs-readonly.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/setup/pi/make-root-fs-readonly.sh b/setup/pi/make-root-fs-readonly.sh
index 7cfb27e..7acc1b2 100644
--- a/setup/pi/make-root-fs-readonly.sh
+++ b/setup/pi/make-root-fs-readonly.sh
@@ -7,8 +7,6 @@ function append_cmdline_txt_param() {
   sed -i "s/\'/ ${toAppend}/g" /boot/cmdline.txt >/dev/null
 }
 
-echo "Updating package index files..."
-apt-get update
 echo "Removing unwanted packages..."
 apt-get remove -y --force-yes --purge triggerhappy logrotate dphys-swapfile
 apt-get -y --force-yes autoremove --purge

From 2f504c8637a191b072da15b9e3e34b8b30fc2634 Mon Sep 17 00:00:00 2001
From: cimryan <cimryan@users.noreply.github.com>
Date: Sat, 3 Nov 2018 19:43:02 -0700
Subject: [PATCH 3/4] Move the upgrade to the end of setup.

Upgrading will update the kernel, which will require reboot. In particular, cifs mounting won't work until the reboot.
---
 setup/pi/setup-teslausb | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/setup/pi/setup-teslausb b/setup/pi/setup-teslausb
index 3b18fdc..bc1d442 100644
--- a/setup/pi/setup-teslausb
+++ b/setup/pi/setup-teslausb
@@ -191,10 +191,12 @@ function make_root_fs_readonly () {
   /tmp/make-root-fs-readonly.sh
 }
 
-function upgrade_packages () {
+function update_package_index () {
   setup_progress "Updating package index files..."
   apt-get update
-  
+}
+
+function upgrade_packages () {  
   setup_progress "Upgrading installed packages..."
   apt-get --assume-yes upgrade
 }
@@ -202,7 +204,7 @@ function upgrade_packages () {
 export -f setup_progress
 export HEADLESS_SETUP
 
-upgrade_packages
+update_package_index
 
 headless_setup_populate_variables
 
@@ -248,6 +250,8 @@ fi
 
 make_root_fs_readonly
 
+upgrade_packages
+
 # If USE_LED_FOR_SETUP_PROGRESS = true. 
 setup_led_on
 

From 749de01c971e39e65a5b6ff165e668e3b07154d4 Mon Sep 17 00:00:00 2001
From: cimryan <cimryan@users.noreply.github.com>
Date: Sat, 3 Nov 2018 21:31:58 -0700
Subject: [PATCH 4/4] Allow skipping the package upgrade.

---
 setup/pi/setup-teslausb | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/setup/pi/setup-teslausb b/setup/pi/setup-teslausb
index bc1d442..7fae377 100644
--- a/setup/pi/setup-teslausb
+++ b/setup/pi/setup-teslausb
@@ -5,6 +5,7 @@ BRANCH=${BRANCH:-master}
 HEADLESS_SETUP=${HEADLESS_SETUP:-false}
 USE_LED_FOR_SETUP_PROGRESS=true
 CONFIGURE_ARCHIVING=${CONFIGURE_ARCHIVING:-true}
+UPGRADE_PACKAGES=${UPGRADE_PACKAGES:-true}
 
 function setup_progress () {
   local setup_logfile=/boot/teslausb-headless-setup.log
@@ -196,9 +197,14 @@ function update_package_index () {
   apt-get update
 }
 
-function upgrade_packages () {  
-  setup_progress "Upgrading installed packages..."
-  apt-get --assume-yes upgrade
+function upgrade_packages () {
+  if [ "$UPGRADE_PACKAGES" = true ]
+  then
+    setup_progress "Upgrading installed packages..."
+    apt-get --assume-yes upgrade
+  else
+    setup_progress "Skipping package upgrade."
+  fi
 }
 
 export -f setup_progress