Index: scripts/globals.sh =================================================================== diff -u -rff9504fe794d645f0fd214a4efc7feb374522401 -rfaa8979f6a4200541aa5d1c46a77f3065ed89bcb --- scripts/globals.sh (.../globals.sh) (revision ff9504fe794d645f0fd214a4efc7feb374522401) +++ scripts/globals.sh (.../globals.sh) (revision faa8979f6a4200541aa5d1c46a77f3065ed89bcb) @@ -135,6 +135,9 @@ SETTING_CONF_FOLDER_PATH=/var/configurations SETTINGS_CRC_FILE_PATH=$DENALI_HOME/settings.crc +CLOUDSYNC_CONFIG_SRC=$CLOUD_HOME/cloudsync/cloudsync/config/config.json +CLOUDSYNC_CONFIG_DST=$SETTING_CONF_FOLDER_PATH/CloudSync/config/config.json + DEMO_MODE=0 P_CANBUS=can0 V_CANBUS=can1 @@ -570,9 +573,9 @@ echo "" } -function startCloudSync_local() { - # ----------------------------------------- CloudSync - post_log_dash " CloudSync " +function cleanCloudSyncBufs() { + # ----------------------------------------- CloudSync buffs cleanup + post_log_dash " CloudSync buffs cleanup" local CLOUDSYNC_PATH=$CLOUD_HOME/$CLOUDSYNC_FOLDER local DATE_UTC=$(date -u +%Y_%m_%d) if [ -d $CLOUDSYNC_PATH ]; then @@ -586,6 +589,23 @@ sudo -u $CLOUD_USER touch "$CLOUDSYNC_LOGS/$DATE_UTC"_out.buf sudo -u $DENALI_USER touch "$CLOUDSYNC_LOGS/$DATE_UTC"_inp.buf + fi +} + +function startCloudSync_local() { + # ----------------------------------------- CloudSync + post_log_dash " CloudSync " + local CLOUDSYNC_PATH=$CLOUD_HOME/$CLOUDSYNC_FOLDER + local DATE_UTC=$(date -u +%Y_%m_%d) + if [ -d $CLOUDSYNC_PATH ]; then + post_log "Verify the CloudSync config" + if [ "$( diff $CLOUDSYNC_CONFIG_SRC $CLOUDSYNC_CONFIG_DST )" != "" ]; then + post_log "CloudSync configuration updated" + sudo -u $CLOUD_USER cp $CLOUDSYNC_CONFIG_SRC $CLOUDSYNC_CONFIG_DST 1>> $POSTOUT 2>> $POSTERR + else + post_log "CloudSync configuration verified" + fi + echo "Executing the CloudSync" cd $CLOUDSYNC_PATH sudo -u $CLOUD_USER ./cs.py start @@ -612,7 +632,7 @@ if [ $(isDemoMode) -eq $TRUE ]; then APPLICATION_PARAMS="$APPLICATION_PARAMS"" -q -D -A $D_CANBUS" fi - sudo -u $DENALI_USER $DENALI_HOME/$DENALI_BIN $APPLICATION_PARAMS_DEFAULT $APPLICATION_PARAMS 1>> /tmp/denali.out 2>> /tmp/denali.out & + sudo -u $DENALI_USER $DENALI_HOME/$DENALI_BIN $APPLICATION_PARAMS_DEFAULT $APPLICATION_PARAMS -C 1>> /tmp/denali.out 2>> /tmp/denali.out & else post_log_fail "Unknown Applicaion Version for $DENALI_HOME/$DENALI_BIN" fi @@ -699,4 +719,3 @@ testTouchscreen testCloudSystem } - Index: scripts/run.sh =================================================================== diff -u -raf999e3daafca03373baf55b20156f97cf6a5c8c -rfaa8979f6a4200541aa5d1c46a77f3065ed89bcb --- scripts/run.sh (.../run.sh) (revision af999e3daafca03373baf55b20156f97cf6a5c8c) +++ scripts/run.sh (.../run.sh) (revision faa8979f6a4200541aa5d1c46a77f3065ed89bcb) @@ -22,8 +22,10 @@ timerStart applicationPOST +cleanCloudSyncBufs testApplicationShasum_local -startCloudSync_local startDemoMode_local startApplication_local +sleep 10 # wait for the UI Software to mount the encrypted partition. +startCloudSync_local timerEndLog Index: scripts/wifi_generate_wpa_supplicant.sh =================================================================== diff -u -ree1c74e58973274b59557d10acce063504fc2d11 -rfaa8979f6a4200541aa5d1c46a77f3065ed89bcb --- scripts/wifi_generate_wpa_supplicant.sh (.../wifi_generate_wpa_supplicant.sh) (revision ee1c74e58973274b59557d10acce063504fc2d11) +++ scripts/wifi_generate_wpa_supplicant.sh (.../wifi_generate_wpa_supplicant.sh) (revision faa8979f6a4200541aa5d1c46a77f3065ed89bcb) @@ -26,10 +26,32 @@ dest=/etc/wpa_supplicant/wpa_supplicant-"$3".conf securityType=$4 psk=$(sudo wpa_passphrase "$ssid" "$password" | grep "psk=" | grep -v "#psk" | sed -nr 's/.*psk=(.*)/\1/p') -case $securityType in +case $securityType in + +#-- WPA3 SAE does not support hashed password +#-- wpa3 ------------------------------------ + wpa3) + echo "Security: $securityType"; + echo "\ +ctrl_interface=/var/run/wpa_supplicant +ctrl_interface_group=0 +update_config=1 + +network={ + ssid=\"$ssid\" + sae_password=\"$password\" + proto=RSN + key_mgmt=SAE + pairwise=CCMP + group=CCMP + ieee80211w=2 +}" | sudo tee $dest > /dev/null;; + +#-- wpa2 ------------------------------------ wpa2) echo "Security: wpa2"; - echo "ctrl_interface=/var/run/wpa_supplicant + echo "\ +ctrl_interface=/var/run/wpa_supplicant ctrl_interface_group=0 update_config=1 @@ -39,18 +61,19 @@ pairwise=CCMP TKIP group=CCMP TKIP scan_ssid=1 - #psk=\"\" psk="$psk" }" | sudo tee $dest > /dev/null;; - wpa) + +#-- wpa ------------------------------------ + wpa) echo "Security: wpa"; - echo "ctrl_interface=/var/run/wpa_supplicant + echo "\ +ctrl_interface=/var/run/wpa_supplicant ctrl_interface_group=0 update_config=1 network={ ssid=\"$ssid\" - #psk=\"\" psk="$psk" }" | sudo tee $dest > /dev/null;;