Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Ray Tanaka
2018-10-31 02:36:20 -07:00
2 changed files with 20 additions and 6 deletions

View File

@@ -1,6 +1,5 @@
#!/bin/bash -eu
SETUP_LOGFILE=/boot/teslausb-headless-setup.log
REPO=${REPO:-cimryan}
BRANCH=${BRANCH:-master}
HEADLESS_SETUP=${HEADLESS_SETUP:-false}
@@ -14,9 +13,10 @@ then
fi
function setup_progress () {
local setup_logfile=/boot/teslausb-headless-setup.log
if [ $HEADLESS_SETUP = "true" ]
then
echo "$( date ) : $1" >> "$SETUP_LOGFILE"
echo "$( date ) : $1" >> "$setup_logfile"
fi
echo $1
}
@@ -145,6 +145,7 @@ function create_usb_drive_backing_files () {
if [ ! -e /dev/mmcblk0p3 ]
then
setup_progress "Starting to create backing files partition..."
/tmp/create-backingfiles-partition.sh "$BACKINGFILES_MOUNTPOINT" "$MUTABLE_MOUNTPOINT"
fi