diff --git a/overlay_rootfs/atom_patch/system_bin/mount_cifs.sh b/overlay_rootfs/atom_patch/system_bin/mount_cifs.sh index 92bf830..efc8373 100755 --- a/overlay_rootfs/atom_patch/system_bin/mount_cifs.sh +++ b/overlay_rootfs/atom_patch/system_bin/mount_cifs.sh @@ -7,9 +7,6 @@ STORAGE_CIFS=$(awk -F "=" '/STORAGE_CIFS *=/ {print $2}' $HACK_INI) STORAGE_CIFSSERVER=$(awk -F "=" '/STORAGE_CIFSSERVER *=/ {gsub(/\/$/, "", $2); print $2}' $HACK_INI) STORAGE_CIFSUSER=$(awk -F "=" '/STORAGE_CIFSUSER *=/ {print $2}' $HACK_INI) STORAGE_CIFSPASSWD=$(awk -F "=" '/STORAGE_CIFSPASSWD *=/ {print $2}' $HACK_INI) -STORAGE_CIFSALWAYSMOUNT=$(awk -F "=" '/STORAGE_CIFSALWAYSMOUNT *=/ {print $2}' $HACK_INI) - -[ "$1" = "watchdog" -a ! "$STORAGE_CIFSALWAYSMOUNT" = "on" ] && exit 0 if [ "$STORAGE_CIFS" = "on" -o "$STORAGE_CIFS" = "alarm" -o "$STORAGE_CIFS" = "record" ] && [ "$STORAGE_CIFSSERVER" != "" ]; then mount | grep "$STORAGE_CIFSSERVER" > /dev/null && exit diff --git a/web/source/vue/Setting.vue b/web/source/vue/Setting.vue index 60af7b6..451aac2 100644 --- a/web/source/vue/Setting.vue +++ b/web/source/vue/Setting.vue @@ -80,7 +80,6 @@ - @@ -230,7 +229,7 @@ STORAGE_SDCARD_PATH: '%Y%m%d/%H%M%S', STORAGE_SDCARD_REMOVE: 'off', STORAGE_SDCARD_REMOVE_DAYS: 30, - STORAGE_SDCARD_DIRECT_WRITE: 'on', + STORAGE_SDCARD_DIRECT_WRITE: 'off', STORAGE_CIFS: 'off', // on(alarm & record), alarm, record, off STORAGE_CIFS_PATH: '%Y%m%d/%H%M%S', STORAGE_CIFS_REMOVE: 'off', @@ -238,7 +237,6 @@ STORAGE_CIFSSERVER: '', STORAGE_CIFSUSER: '', STORAGE_CIFSPASSWD: '', - STORAGE_CIFSALWAYSMOUNT: 'on', TIMELAPSE: 'off', TIMELAPSE_SCHEDULE: '0 4 * * 0:1:2:3:4:5:6', // -> /var/spool/crontabs/root TIMELAPSE_PATH: '%Y%m%d%H%M', @@ -717,7 +715,8 @@ (this.config.REBOOT_SCHEDULE !== this.oldConfig.REBOOT_SCHEDULE)) { execCmds.push('setCron'); } - if(this.config.STORAGE_SDCARD !== this.oldConfig.STORAGE_SDCARD) { + if((this.config.STORAGE_SDCARD !== this.oldConfig.STORAGE_SDCARD) || + (this.config.STORAGE_SDCARD_DIRECT_WRITE !== this.oldConfig.STORAGE_SDCARD_DIRECT_WRITE)) { let periodic = 'ram'; let alarm = 'ram'; if(this.config.STORAGE_SDCARD_DIRECT_WRITE === 'on') { diff --git a/web/source/vue/i18n-en.yaml b/web/source/vue/i18n-en.yaml index ac0709a..b2c167c 100644 --- a/web/source/vue/i18n-en.yaml +++ b/web/source/vue/i18n-en.yaml @@ -69,9 +69,6 @@ recording: savePath: title: Save PATH tooltip: enter the storage PATH after the network name in strftime format ending with the file extension. - alwaysMount: - title: always mount - tooltip: Monitor the NAS to mount periodically. automaticDeletion: title: Automatic Recording Deletion tooltip: Automatically delete recordings from the CIFS Server diff --git a/web/source/vue/i18n-ja.yaml b/web/source/vue/i18n-ja.yaml index c9f2a63..b39ddcf 100644 --- a/web/source/vue/i18n-ja.yaml +++ b/web/source/vue/i18n-ja.yaml @@ -69,9 +69,6 @@ recording: savePath: title: 保存するPATH tooltip: ネットワークPATH以降の録画するPATHをstrftimeの書式指定で記述します。最後に拡張子が付加されます - alwaysMount: - title: 常時マウント - tooltip: 定期的にNASをmountするように監視します automaticDeletion: title: ファイルの自動削除 tooltip: CIFS Serverに録画したファイルを自動的に削除します