Index: sources/storage/StorageGlobals.cpp =================================================================== diff -u -rd9b9df9b23da89b4c27f4672ff6e7f570adcc48a -r472c10e72a8d278f13d2343f9c81c1def14490ff --- sources/storage/StorageGlobals.cpp (.../StorageGlobals.cpp) (revision d9b9df9b23da89b4c27f4672ff6e7f570adcc48a) +++ sources/storage/StorageGlobals.cpp (.../StorageGlobals.cpp) (revision 472c10e72a8d278f13d2343f9c81c1def14490ff) @@ -101,8 +101,13 @@ #ifdef BUILD_FOR_TARGET //WARNING: This has to match with the crypt_setup.sh - const char *Settings_Path_Init = "/home/root/.config/"; // this is the manufacturing or update setup and the user is root. - const char *Settings_Path_Name = "/var/configurations/"; + #ifdef LEAHI_DIGI_BOARD + const char *Settings_Path_Init = "/opt/leahi/configurations/"; // this is the manufacturing or update setup and the user is root. + const char *Settings_Path_Name = "/mnt/data/configurations/"; + #else + const char *Settings_Path_Init = "/home/root/.config/"; // this is the manufacturing or update setup and the user is root. + const char *Settings_Path_Name = "/var/configurations/"; + #endif #else // should be in the project application folder. [is tracking by git] const char *Settings_Path_Init = "/home/denali/Projects/application/resources/settings/"; @@ -129,7 +134,11 @@ // CloudSync credentials #ifdef BUILD_FOR_TARGET - const char *CloudSync_Base_Path_Name = gUseRootHome ? "/home/root/.cloudSync/" : "/var/configurations/CloudSync/"; + #ifdef LEAHI_DIGI_BOARD + const char *CloudSync_Base_Path_Name = gUseRootHome ? "/home/root/.cloudSync/" : "/mnt/data/configurations/CloudSync/"; + #else + const char *CloudSync_Base_Path_Name = gUseRootHome ? "/home/root/.cloudSync/" : "/var/configurations/CloudSync/"; + #endif #else // on VM it is a temporary file which is not being tracked const char *CloudSync_Base_Path_Name = "/home/denali/Desktop/CloudSync/"; @@ -171,28 +180,16 @@ const char *Date_Time_Set_Sh = "date_time_set.sh"; // WiFi Settings - const char *Wifi_Disconnect_Network = "wifi_disconnect_network.sh"; - const char *Wifi_Generate_WPA_Supplicant = "wifi_generate_wpa_supplicant.sh"; - const char *Wifi_Read_DNS = "wifi_read_dns.sh"; - const char *Wifi_Read_Gateway = "wifi_read_gateway.sh"; - const char *Wifi_Read_IP_Settings = "wifi_read_ip_settings.sh"; - const char *Wifi_Get_Auto_Assigned_IP = "wifi_request_auto_assigned_ip.sh"; - const char *Wifi_Reset_Adapter = "wifi_reset_adapter.sh"; - const char *Wifi_Reset_Interface = "wifi_reset_interface.sh"; - const char *Wifi_Scan_For_Networks = "wifi_scan_for_networks.sh"; - const char *Wifi_Set_Auto_Assigned_IP = "wifi_set_auto_assigned_ip.sh"; - const char *Wifi_Set_DNS = "wifi_set_dns.sh"; - const char *Wifi_Set_Static_IP = "wifi_set_static_ip.sh"; - const char *Wifi_Set_Gateway = "wifi_set_gateway.sh"; - const char *Wifi_Set_SubnetMask = "wifi_set_subnetmask.sh"; - const char *Wifi_Start_WPA_Supplicant = "wifi_start_wpa_supplicant.sh"; - const char *Wifi_Read_Network_Info = "wifi_read_network_info.sh"; + const char *Scripts_Wifi_Scan = "wifi_scan.sh"; + const char *Scripts_Wifi_Disconnect = "wifi_disconnect.sh"; + const char *Scripts_Wifi_Active_Info = "wifi_active_info.sh"; + const char *Scripts_Wifi_Connect_Dhcp = "wifi_connect_dhcp.sh"; + // Brightness - const char *Brightness_Set = "brightness_set.sh"; - const char *Brightness_Get = "brightness_get.sh"; + const char *Scripts_Brightness = "brightness.sh"; // Root SSH - const char *RootSSHAccess = "rootsshaccess.sh"; + const char *Scripts_Ssh_Access = "rootsshaccess.sh"; // Bluetooth const char *Bluetooth_Paired_Reset = "bluetooth_paired_clear.sh"; @@ -202,18 +199,21 @@ const char *Crypt_Setup = "crypt_setup.sh"; // Factory Reset - const char *Factory_Reset = "factory_reset.sh"; + const char *Scripts_Factory_Reset = "factory_reset.sh"; // Device Decommissioning - const char *Device_Decommission = "decommission.sh"; + const char *Scripts_Device_Decommission = "decommission.sh"; // Device Lockdown - const char *Device_Lockdown = "lockdown.sh"; + const char *Scripts_Device_Lockdown = "lockdown.sh"; +#ifdef LEAHI_DIGI_BOARD + const char *CloudSyncPath = "/mnt/data/configurations/CloudSync/credentials/"; +#else const char *CloudSyncPath = "/var/configurations/CloudSync/credentials/"; - +#endif // USB unmount/ mount - const char *USB_Unmount = "usb_unmount.sh"; - const char *USB_Mount = "usb_mount.sh"; + const char *Scripts_USB_Unmount = "usb_unmount.sh"; + const char *Scripts_USB_Mount = "usb_mount.sh"; }