mirror of
https://github.com/cimryan/teslausb.git
synced 2026-03-01 04:30:33 +00:00
Merge branch 'u/rtgoodwin/headless-patch' into headless-patch
This commit is contained in:
@@ -154,6 +154,7 @@ function fix_cmdline_txt_modules_load ()
|
||||
}
|
||||
|
||||
BACKINGFILES_MOUNTPOINT=/backingfiles
|
||||
MUTABLE_MOUNTPOINT=/mutable
|
||||
|
||||
function create_usb_drive_backing_files () {
|
||||
if [ ! -e "$BACKINGFILES_MOUNTPOINT" ]
|
||||
@@ -161,9 +162,14 @@ function create_usb_drive_backing_files () {
|
||||
mkdir "$BACKINGFILES_MOUNTPOINT"
|
||||
fi
|
||||
|
||||
if [ ! -e "$MUTABLE_MOUNTPOINT" ]
|
||||
then
|
||||
mkdir "$MUTABLE_MOUNTPOINT"
|
||||
fi
|
||||
|
||||
if [ ! -e /dev/mmcblk0p3 ]
|
||||
then
|
||||
/tmp/create-backingfiles-partition.sh "$BACKINGFILES_MOUNTPOINT"
|
||||
/tmp/create-backingfiles-partition.sh "$BACKINGFILES_MOUNTPOINT" "$MUTABLE_MOUNTPOINT"
|
||||
fi
|
||||
|
||||
if ! findmnt --mountpoint $BACKINGFILES_MOUNTPOINT
|
||||
@@ -190,6 +196,11 @@ function configure_archive_scripts () {
|
||||
get_script /root/bin archive-clips.sh run/rsync_archive
|
||||
get_script /root/bin connect-archive.sh run/rsync_archive
|
||||
get_script /root/bin disconnect-archive.sh run/rsync_archive
|
||||
elif [ $RCLONE_ENABLE = true ]
|
||||
then
|
||||
get_script /root/bin archive-clips.sh run/rclone_archive
|
||||
get_script /root/bin connect-archive.sh run/rclone_archive
|
||||
get_script /root/bin disconnect-archive.sh run/rclone_archive
|
||||
else
|
||||
get_script /root/bin archive-clips.sh run/cifs_archive
|
||||
get_script /root/bin connect-archive.sh run/cifs_archive
|
||||
@@ -264,6 +275,7 @@ headless_setup_progress_flash 1
|
||||
setup_progress "Verifying environment variables..."
|
||||
|
||||
RSYNC_ENABLE="${RSYNC_ENABLE:-false}"
|
||||
RCLONE_ENABLE="${RCLONE_ENABLE:-false}"
|
||||
|
||||
if [ "$RSYNC_ENABLE" = true ]
|
||||
then
|
||||
@@ -271,6 +283,12 @@ then
|
||||
check_variable "RSYNC_SERVER"
|
||||
export archiveserver="$RSYNC_SERVER"
|
||||
check_variable "RSYNC_PATH"
|
||||
elif [ "$RCLONE_ENABLE" = true ]
|
||||
then
|
||||
check_variable "RCLONE_DRIVE"
|
||||
check_variable "RCLONE_PATH"
|
||||
# since it's a cloud hosted drive we'll just set this to google dns
|
||||
export archiveserver="8.8.8.8"
|
||||
else # Else for now, TODO allow both for more redundancy?
|
||||
check_variable "sharename"
|
||||
check_variable "shareuser"
|
||||
@@ -298,6 +316,10 @@ if [ "$RSYNC_ENABLE" = true ]
|
||||
then
|
||||
get_script /root/bin verify-archive-configuration.sh run/rsync_archive
|
||||
get_script /root/bin configure-archive.sh run/rsync_archive
|
||||
elif [ "$RCLONE_ENABLE" = true ]
|
||||
then
|
||||
get_script /root/bin verify-archive-configuration.sh run/rclone_archive
|
||||
get_script /root/bin configure-archive.sh run/rclone_archive
|
||||
else
|
||||
get_script /root/bin verify-archive-configuration.sh run/cifs_archive
|
||||
get_script /root/bin configure-archive.sh run/cifs_archive
|
||||
|
||||
Reference in New Issue
Block a user