Merge pull request #94 from cimryan/feature/upgrade-packages-during-setup

Feature/upgrade packages during setup
This commit is contained in:
cimryan
2018-11-03 21:32:55 -07:00
committed by GitHub
2 changed files with 20 additions and 2 deletions

View File

@@ -7,8 +7,6 @@ function append_cmdline_txt_param() {
sed -i "s/\'/ ${toAppend}/g" /boot/cmdline.txt >/dev/null sed -i "s/\'/ ${toAppend}/g" /boot/cmdline.txt >/dev/null
} }
echo "Updating package index files..."
apt-get update
echo "Removing unwanted packages..." echo "Removing unwanted packages..."
apt-get remove -y --force-yes --purge triggerhappy logrotate dphys-swapfile apt-get remove -y --force-yes --purge triggerhappy logrotate dphys-swapfile
apt-get -y --force-yes autoremove --purge apt-get -y --force-yes autoremove --purge

View File

@@ -5,6 +5,7 @@ BRANCH=${BRANCH:-master}
HEADLESS_SETUP=${HEADLESS_SETUP:-false} HEADLESS_SETUP=${HEADLESS_SETUP:-false}
USE_LED_FOR_SETUP_PROGRESS=true USE_LED_FOR_SETUP_PROGRESS=true
CONFIGURE_ARCHIVING=${CONFIGURE_ARCHIVING:-true} CONFIGURE_ARCHIVING=${CONFIGURE_ARCHIVING:-true}
UPGRADE_PACKAGES=${UPGRADE_PACKAGES:-true}
function setup_progress () { function setup_progress () {
local setup_logfile=/boot/teslausb-headless-setup.log local setup_logfile=/boot/teslausb-headless-setup.log
@@ -191,9 +192,26 @@ function make_root_fs_readonly () {
/tmp/make-root-fs-readonly.sh /tmp/make-root-fs-readonly.sh
} }
function update_package_index () {
setup_progress "Updating package index files..."
apt-get update
}
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 export -f setup_progress
export HEADLESS_SETUP export HEADLESS_SETUP
update_package_index
headless_setup_populate_variables headless_setup_populate_variables
# If USE_LED_FOR_SETUP_PROGRESS = true. # If USE_LED_FOR_SETUP_PROGRESS = true.
@@ -238,6 +256,8 @@ fi
make_root_fs_readonly make_root_fs_readonly
upgrade_packages
# If USE_LED_FOR_SETUP_PROGRESS = true. # If USE_LED_FOR_SETUP_PROGRESS = true.
setup_led_on setup_led_on