Move creation of the TeslaCam directory to create-backingfiles.sh

The create-backingfiles.sh file already contains the responsibility for defining the mount points, which this step needs.
This commit is contained in:
cimryan
2018-10-23 18:18:35 -07:00
parent cc89acefce
commit 5b75897c7d
2 changed files with 8 additions and 8 deletions

View File

@@ -21,6 +21,12 @@ function add_drive () {
echo "$filename $mountpoint vfat noauto,users,umask=000 0 0" >> /etc/fstab echo "$filename $mountpoint vfat noauto,users,umask=000 0 0" >> /etc/fstab
} }
function create_teslacam_directory () {
mount /mnt/cam
mkdir /mnt/cam/TeslaCam
umount /mnt/cam
}
FREE_1K_BLOCKS="$(df --output=avail --block-size=1K /backingfiles/ | tail -n 1)" FREE_1K_BLOCKS="$(df --output=avail --block-size=1K /backingfiles/ | tail -n 1)"
CAM_DISK_SIZE="$(( $FREE_1K_BLOCKS * $CAM_PERCENT / 100 ))" CAM_DISK_SIZE="$(( $FREE_1K_BLOCKS * $CAM_PERCENT / 100 ))"
@@ -36,3 +42,5 @@ then
else else
echo "options g_mass_storage file=$CAM_DISK_FILE_NAME removable=1 ro=0 stall=0 iSerialNumber=123456" > "$G_MASS_STORAGE_CONF_FILE_NAME" echo "options g_mass_storage file=$CAM_DISK_FILE_NAME removable=1 ro=0 stall=0 iSerialNumber=123456" > "$G_MASS_STORAGE_CONF_FILE_NAME"
fi fi
create_teslacam_directory

View File

@@ -139,12 +139,6 @@ function create_usb_drive_backing_files () {
/tmp/create-backingfiles.sh "$campercent" "$BACKINGFILES_MOUNTPOINT" /tmp/create-backingfiles.sh "$campercent" "$BACKINGFILES_MOUNTPOINT"
} }
function create_teslacam_directory () {
mount /mnt/cam
mkdir /mnt/cam/TeslaCam
umount /mnt/cam
}
function configure_archive () { function configure_archive () {
local archive_server_ip_address="$1" local archive_server_ip_address="$1"
@@ -276,8 +270,6 @@ echo "" >> /etc/fstab
create_usb_drive_backing_files create_usb_drive_backing_files
create_teslacam_directory
configure_archive "$ARCHIVE_SERVER_IP_ADDRESS" configure_archive "$ARCHIVE_SERVER_IP_ADDRESS"
configure_rc_local configure_rc_local