carsten/teslausb
1
0
Fork 0
mirror of https://github.com/cimryan/teslausb.git synced 2026-03-01 04:30:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #53 from rtanaka/master

Browse Source 
use BACKINGFILES_MOUNTPOINT in all places for consistency
This commit is contained in:
cimryan
2018-10-25 06:43:52 -07:00
committed by GitHub
parent f45f61ab51 3263313cdb
commit a996acfc0a
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
setup/pi/create-backingfiles.sh
View File

@@ -27,7 +27,7 @@ function create_teslacam_directory () {
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_MOUNTPOINT/ | tail -n 1)"
CAM_DISK_SIZE="$(( $FREE_1K_BLOCKS * $CAM_PERCENT / 100 ))"
CAM_DISK_FILE_NAME="$BACKINGFILES_MOUNTPOINT/cam_disk.bin"
@@ -35,7 +35,7 @@ add_drive "cam" "CAM" "$CAM_DISK_SIZE" "$CAM_DISK_FILE_NAME"
if [ "$CAM_PERCENT" -lt 100 ]
then
MUSIC_DISK_SIZE="$(df --output=avail --block-size=1K /backingfiles/ | tail -n 1)"
MUSIC_DISK_SIZE="$(df --output=avail --block-size=1K $BACKINGFILES_MOUNTPOINT/ | tail -n 1)"
MUSIC_DISK_FILE_NAME="$BACKINGFILES_MOUNTPOINT/music_disk.bin"
add_drive "music" "MUSIC" "$MUSIC_DISK_SIZE" "$MUSIC_DISK_FILE_NAME"
echo "options g_mass_storage file=$CAM_DISK_FILE_NAME,$MUSIC_DISK_FILE_NAME removable=1,1 ro=0,0 stall=0 iSerialNumber=123456" > "$G_MASS_STORAGE_CONF_FILE_NAME"

6
setup/pi/setup-teslausb
View File

@@ -95,14 +95,14 @@ function create_usb_drive_backing_files () {
/tmp/create-backingfiles-partition.sh "$BACKINGFILES_MOUNTPOINT"
fi
if ! findmnt --mountpoint /backingfiles
if ! findmnt --mountpoint $BACKINGFILES_MOUNTPOINT
then
echo "Mounting the partition for the backing files..."
mount /backingfiles
mount $BACKINGFILES_MOUNTPOINT
echo "Mounted the partition for the backing files."
fi
if [ ! -e /backingfiles/*.bin ]
if [ ! -e $BACKINGFILES_MOUNTPOINT/*.bin ]
then
/tmp/create-backingfiles.sh "$campercent" "$BACKINGFILES_MOUNTPOINT"
fi