Skip to content

Commit a701015

Browse files
mnakadamnakada
committed
Merge branch 'mount_cifs'
* mount_cifs: CIFS mountがVer.3.0しか対応していなかった Ver.2.0, 2.1, 3.0に対応
2 parents af1c08f + d78aeec commit a701015

File tree

5 files changed

+36
-46
lines changed

5 files changed

+36
-46
lines changed

‎configs/overlay_rootfs/etc/init.d/S38atomcam

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ case "$1" in
1818
mount -o rbind /media /atom/media
1919
mkdir -p /tmp/system/bin
2020
cp /scripts/atom_init.sh /tmp/system/bin
21+
cp /scripts/mount_cifs.sh /tmp/system/bin/mount_cifs
2122
cp /scripts/rm.sh /tmp/system/bin/rm
2223
cp /scripts/mv.sh /tmp/system/bin/mv
2324
cp /usr/bin/curl /tmp/system/bin

‎configs/overlay_rootfs/scripts/mount_cifs.sh

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#!/bin/sh
2+
3+
HACK_INI=/media/mmc/hack.ini
4+
STORAGE_CIFS=$(awk -F "=" '/STORAGE_CIFS *=/ {print $2}' $HACK_INI)
5+
STORAGE_CIFSSERVER=$(awk -F "=" '/STORAGE_CIFSSERVER *=/ {gsub(/\/$/, "", $2); print $2}' $HACK_INI)
6+
STORAGE_CIFSUSER=$(awk -F "=" '/STORAGE_CIFSUSER *=/ {print $2}' $HACK_INI)
7+
STORAGE_CIFSPASSWD=$(awk -F "=" '/STORAGE_CIFSPASSWD *=/ {print $2}' $HACK_INI)
8+
9+
if [ "$STORAGE_CIFS" = "on" ] && [ "$STORAGE_CIFSSERVER" != "" ]; then
10+
mount | grep "$STORAGE_CIFSSERVER" > /dev/null && exit
11+
for VER in 3.0 2.1 2.0
12+
do
13+
LD_LIBRARY_PATH=/tmp/system/lib:/usr/lib:/usr/lib/samba /tmp/system/lib/ld.so.1 /tmp/system/bin/busybox mount -t cifs -ousername=$STORAGE_CIFSUSER,password=$STORAGE_CIFSPASSWD,vers=$VER $STORAGE_CIFSSERVER /mnt && exit
14+
done
15+
fi
16+
exit -1

‎configs/overlay_rootfs/scripts/mv.sh

+7-16
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@ HACK_INI=/media/mmc/hack.ini
1212
RECORDING_LOCAL_SCHEDULE=$(awk -F "=" '/RECORDING_LOCAL_SCHEDULE *=/ {print $2}' $HACK_INI)
1313
STORAGE_CIFS_PATH=$(awk -F "=" '/STORAGE_CIFS_PATH *=/ { gsub(/^\/*/, "", $2);print $2}' $HACK_INI)
1414
STORAGE_SDCARD=$(awk -F "=" '/STORAGE_SDCARD *=/ {print $2}' $HACK_INI)
15-
STORAGE_CIFS=$(awk -F "=" '/STORAGE_CIFS *=/ {print $2}' $HACK_INI)
16-
STORAGE_CIFSSERVER=$(awk -F "=" '/STORAGE_CIFSSERVER *=/ {gsub(/\/$/, "", $2); print $2}' $HACK_INI)
17-
STORAGE_CIFSUSER=$(awk -F "=" '/STORAGE_CIFSUSER *=/ {print $2}' $HACK_INI)
18-
STORAGE_CIFSPASSWD=$(awk -F "=" '/STORAGE_CIFSPASSWD *=/ {print $2}' $HACK_INI)
1915
WEBHOOK=$(awk -F "=" '/WEBHOOK *=/ {print $2}' $HACK_INI)
2016
WEBHOOK_URL=$(awk -F "=" '/WEBHOOK_URL *=/ {print $2}' $HACK_INI)
2117
WEBHOOK_RECORD_EVENT=$(awk -F "=" '/WEBHOOK_RECORD_EVENT *=/ {print $2}' $HACK_INI)
@@ -81,17 +77,12 @@ else
8177
fi
8278

8379
if [ "$FMT" != "" ]; then
84-
if [ "$STORAGE_CIFS" = "on" ] && [ "$STORAGE_CIFSSERVER" != "" ]; then
85-
if ! mount | grep "$STORAGE_CIFSSERVER" > /dev/null ; then
86-
LD_LIBRARY_PATH=/tmp/system/lib:/usr/lib:/usr/lib/samba /tmp/system/lib/ld.so.1 /tmp/system/bin/busybox mount -t cifs -ousername=$STORAGE_CIFSUSER,password=$STORAGE_CIFSPASSWD,vers=3.0 $STORAGE_CIFSSERVER /mnt
87-
fi
88-
if [ $? = 0 ]; then
89-
TIME=`echo $2 | sed -e 's|^/media/mmc/record/||' -e 's|/||g' -e 's|.mp4$||'`
90-
OUTFILE=`TZ=JST-9 date -d $TIME +"/mnt/$HOSTNAME/record/$STORAGE_CIFS_PATH.mp4"`
91-
DIR_PATH=${OUTFILE%/*}
92-
mkdir -p $DIR_PATH
93-
cp $1 $OUTFILE
94-
fi
80+
if /tmp/system/bin/mount_cifs ; then
81+
TIME=`echo $2 | sed -e 's|^/media/mmc/record/||' -e 's|/||g' -e 's|.mp4$||'`
82+
OUTFILE=`TZ=JST-9 date -d $TIME +"/mnt/$HOSTNAME/record/$STORAGE_CIFS_PATH.mp4"`
83+
DIR_PATH=${OUTFILE%/*}
84+
mkdir -p $DIR_PATH
85+
cp $1 $OUTFILE
9586
fi
9687

9788
if [ "$STORAGE_SDCARD" = "on" ]; then
@@ -101,7 +92,7 @@ if [ "$FMT" != "" ]; then
10192
fi
10293
if [ "$WEBHOOK" = "on" ] && [ "$WEBHOOK_URL" != "" ]; then
10394
if [ "$WEBHOOK_RECORD_EVENT" = "on" ]; then
104-
LD_LIBRARY_PATH=/tmp/system/lib:/usr/lib /tmp/system/lib/ld.so.1 /tmp/system/bin/curl -X POST -H "Content-Type: application/json" -d "{\"type\":\"recordEvent\", \"device\":\"${HOSTNAME}\"}" $WEBHOOK_URL
95+
LD_LIBRARY_PATH=/tmp/system/lib:/usr/lib /tmp/system/lib/ld.so.1 /tmp/system/bin/curl -X POST -H "Content-Type: application/json" -d "{\"type\":\"recordEvent\", \"device\":\"${HOSTNAME}\"}" $WEBHOOK_URL > /dev/null 2>&1
10596
fi
10697
fi
10798
else

‎configs/overlay_rootfs/scripts/remove_old.sh

+3-12
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ STORAGE_CIFS_REMOVE=$(awk -F "=" '/STORAGE_CIFS_REMOVE *=/ {print $2}' $HACK_INI
88
STORAGE_CIFS_REMOVE_DAYS=$(awk -F "=" '/STORAGE_CIFS_REMOVE_DAYS *=/ {print $2}' $HACK_INI)
99

1010
STORAGE_SDCARD=$(awk -F "=" '/STORAGE_SDCARD *=/ {print $2}' $HACK_INI)
11-
STORAGE_CIFS=$(awk -F "=" '/STORAGE_CIFS *=/ {print $2}' $HACK_INI)
12-
STORAGE_CIFSSERVER=$(awk -F "=" '/STORAGE_CIFSSERVER *=/ {gsub(/\/$/, "", $2); print $2}' $HACK_INI)
13-
STORAGE_CIFSUSER=$(awk -F "=" '/STORAGE_CIFSUSER *=/ {print $2}' $HACK_INI)
14-
STORAGE_CIFSPASSWD=$(awk -F "=" '/STORAGE_CIFSPASSWD *=/ {print $2}' $HACK_INI)
1511
HOSTNAME=`hostname`
1612

1713
if [ "$STORAGE_SDCARD_REMOVE" = "on" ] && [ "$STORAGE_SDCARD_REMOVE_DAYS" != "" ]; then
@@ -22,13 +18,8 @@ if [ "$STORAGE_SDCARD_REMOVE" = "on" ] && [ "$STORAGE_SDCARD_REMOVE_DAYS" != ""
2218
fi
2319

2420
if [ "$STORAGE_CIFS_REMOVE" = "on" ] && [ "$STORAGE_CIFS_REMOVE_DAYS" != "" ]; then
25-
if [ "$STORAGE_CIFS" = "on" ] && [ "$STORAGE_CIFSSERVER" != "" ]; then
26-
if ! mount | grep "$STORAGE_CIFSSERVER" > /dev/null ; then
27-
mount -t cifs -ousername=$STORAGE_CIFSUSER,password=$STORAGE_CIFSPASSWD,vers=3.0 $STORAGE_CIFSSERVER /atom/mnt
28-
fi
29-
if [ $? = 0 ]; then
30-
find /atom/mnt/$HOSTNAME -depth -type f -mtime +$STORAGE_CIFS_REMOVE_DAYS -delete
31-
find /atom/mnt/$HOSTNAME -depth -type d -empty -delete
32-
fi
21+
if /tmp/system/bin/mount_cifs ; then
22+
find /atom/mnt/$HOSTNAME -depth -type f -mtime +$STORAGE_CIFS_REMOVE_DAYS -delete
23+
find /atom/mnt/$HOSTNAME -depth -type d -empty -delete
3324
fi
3425
fi

‎configs/overlay_rootfs/scripts/rm.sh

+9-18
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ RECORDING_ALARM=$(awk -F "=" '/RECORDING_ALARM *=/ {print $2}' $HACK_INI)
1515
STORAGE_CIFS_PATH=$(awk -F "=" '/STORAGE_CIFS_PATH *=/ { gsub(/^\/*/, "", $2);print $2}' $HACK_INI)
1616
STORAGE_SDCARD_PATH=$(awk -F "=" '/STORAGE_SDCARD_PATH *=/ { gsub(/^\/*/, "", $2);print $2}' $HACK_INI)
1717
STORAGE_SDCARD=$(awk -F "=" '/STORAGE_SDCARD *=/ {print $2}' $HACK_INI)
18-
STORAGE_CIFS=$(awk -F "=" '/STORAGE_CIFS *=/ {print $2}' $HACK_INI)
19-
STORAGE_CIFSSERVER=$(awk -F "=" '/STORAGE_CIFSSERVER *=/ {gsub(/\/$/, "", $2); print $2}' $HACK_INI)
20-
STORAGE_CIFSUSER=$(awk -F "=" '/STORAGE_CIFSUSER *=/ {print $2}' $HACK_INI)
21-
STORAGE_CIFSPASSWD=$(awk -F "=" '/STORAGE_CIFSPASSWD *=/ {print $2}' $HACK_INI)
2218
WEBHOOK=$(awk -F "=" '/WEBHOOK *=/ {print $2}' $HACK_INI)
2319
WEBHOOK_URL=$(awk -F "=" '/WEBHOOK_URL *=/ {print $2}' $HACK_INI)
2420
WEBHOOK_ALERM_PICT=$(awk -F "=" '/WEBHOOK_ALERM_PICT *=/ {print $2}' $HACK_INI)
@@ -83,24 +79,19 @@ fi
8379

8480
if [ "$WEBHOOK" = "on" ] && [ "$WEBHOOK_URL" != "" ]; then
8581
if [ "$WEBHOOK_ALERM_PICT" = "on" ] && [ "$FILE" = "/tmp/alarm.jpg" ]; then
86-
LD_LIBRARY_PATH=/tmp/system/lib:/usr/lib /tmp/system/lib/ld.so.1 /tmp/system/bin/curl -X POST -F "image=@$FILE" -F"type=image/jpeg" -F"device=${HOSTNAME}" $WEBHOOK_URL
82+
LD_LIBRARY_PATH=/tmp/system/lib:/usr/lib /tmp/system/lib/ld.so.1 /tmp/system/bin/curl -X POST -F "image=@$FILE" -F"type=image/jpeg" -F"device=${HOSTNAME}" $WEBHOOK_URL > /dev/null 2>&1
8783
fi
8884
if [ "$WEBHOOK_ALERM_VIDEO" = "on" ] && [ "$FILE" = "/tmp/alarm_record.mp4" ]; then
89-
LD_LIBRARY_PATH=/tmp/system/lib:/usr/lib /tmp/system/lib/ld.so.1 /tmp/system/bin/curl -X POST -F "video=@$FILE" -F "type=video/mp4" -F"device=${HOSTNAME}" $WEBHOOK_URL
85+
LD_LIBRARY_PATH=/tmp/system/lib:/usr/lib /tmp/system/lib/ld.so.1 /tmp/system/bin/curl -X POST -F "video=@$FILE" -F "type=video/mp4" -F"device=${HOSTNAME}" $WEBHOOK_URL > /dev/null 2>&1
9086
fi
9187
fi
9288

9389
if [ "$FMT" != "" ] && [ "$RECORDING_ALARM" = "on" ]; then
94-
if [ "$STORAGE_CIFS" = "on" ] && [ "$STORAGE_CIFSSERVER" != "" ]; then
95-
if ! mount | grep "$STORAGE_CIFSSERVER" > /dev/null ; then
96-
LD_LIBRARY_PATH=/tmp/system/lib:/usr/lib:/usr/lib/samba /tmp/system/lib/ld.so.1 /tmp/system/bin/busybox mount -t cifs -ousername=$STORAGE_CIFSUSER,password=$STORAGE_CIFSPASSWD,vers=3.0 $STORAGE_CIFSSERVER /mnt
97-
fi
98-
if [ $? = 0 ]; then
99-
OUTFILE=`TZ=JST-9 date +"/mnt/$HOSTNAME/alarm_record/$STORAGE_CIFS_PATH.${FILE##*.}"`
100-
DIR_PATH=${OUTFILE%/*}
101-
mkdir -p $DIR_PATH
102-
cp $FILE $OUTFILE
103-
fi
90+
if /tmp/system/bin/mount_cifs ; then
91+
OUTFILE=`TZ=JST-9 date +"/mnt/$HOSTNAME/alarm_record/$STORAGE_CIFS_PATH.${FILE##*.}"`
92+
DIR_PATH=${OUTFILE%/*}
93+
mkdir -p $DIR_PATH
94+
cp $FILE $OUTFILE
10495
fi
10596

10697
if [ "$STORAGE_SDCARD" = "on" ]; then
@@ -114,10 +105,10 @@ if [ "$FMT" != "" ] && [ "$RECORDING_ALARM" = "on" ]; then
114105

115106
if [ "$WEBHOOK" = "on" ] && [ "$WEBHOOK_URL" != "" ]; then
116107
if [ "$WEBHOOK_ALARM_PICT_FINISH" = "on" ] && [ "$FILE" = "/tmp/alarm.jpg" ]; then
117-
LD_LIBRARY_PATH=/tmp/system/lib:/usr/lib /tmp/system/lib/ld.so.1 /tmp/system/bin/curl -X POST -H "Content-Type: application/json" -d "{\"type\":\"uploadPictureFinish\", \"device\":\"${HOSTNAME}\"}" $WEBHOOK_URL
108+
LD_LIBRARY_PATH=/tmp/system/lib:/usr/lib /tmp/system/lib/ld.so.1 /tmp/system/bin/curl -X POST -H "Content-Type: application/json" -d "{\"type\":\"uploadPictureFinish\", \"device\":\"${HOSTNAME}\"}" $WEBHOOK_URL > /dev/null 2>&1
118109
fi
119110
if [ "$WEBHOOK_ALARM_VIDEO_FINISH" = "on" ] && [ "$FILE" = "/tmp/alarm_record.mp4" ]; then
120-
LD_LIBRARY_PATH=/tmp/system/lib:/usr/lib /tmp/system/lib/ld.so.1 /tmp/system/bin/curl -X POST -H "Content-Type: application/json" -d "{\"type\":\"uploadVideoFinish\", \"device\":\"${HOSTNAME}\"}" $WEBHOOK_URL
111+
LD_LIBRARY_PATH=/tmp/system/lib:/usr/lib /tmp/system/lib/ld.so.1 /tmp/system/bin/curl -X POST -H "Content-Type: application/json" -d "{\"type\":\"uploadVideoFinish\", \"device\":\"${HOSTNAME}\"}" $WEBHOOK_URL > /dev/null 2>&1
121112
fi
122113
fi
123114

0 commit comments

Comments
 (0)