diff options
| author | Grant Erickson <marathon96@gmail.com> | 2012-05-21 12:43:50 -0700 |
|---|---|---|
| committer | Patrik Flykt <patrik.flykt@linux.intel.com> | 2012-05-24 16:33:59 +0300 |
| commit | 9c144117e0cd50aea8de2a1164136e205fd73541 (patch) | |
| tree | 2094ed52b15764e58ab6894eff5a7e994c1e4343 /src/storage.c | |
| parent | 6df0c9192a3dd6cfcc5108ec8f08f928902c8716 (diff) | |
| download | connman-9c144117e0cd50aea8de2a1164136e205fd73541.tar.gz connman-9c144117e0cd50aea8de2a1164136e205fd73541.tar.bz2 connman-9c144117e0cd50aea8de2a1164136e205fd73541.zip | |
storage: migrate 0.76-era device enabled / powered state
This patch ensures that [device_<type>] Powered=<true|false> device enabled
/ powered state migrates from 0.76-era versions of default.profile.
Diffstat (limited to 'src/storage.c')
| -rw-r--r-- | src/storage.c | 34 |
1 files changed, 29 insertions, 5 deletions
diff --git a/src/storage.c b/src/storage.c index 5fcec55c..5e703ebb 100644 --- a/src/storage.c +++ b/src/storage.c @@ -476,11 +476,19 @@ void __connman_storage_migrate() g_key_file_set_boolean(keyfile, "global", "OfflineMode", val); + /* Migrate Powered/Enable state key/value pairs from legacy + * settings + */ + val = g_key_file_get_boolean(keyfile_def, "WiFi", "Enable", &error); if (error != NULL) { g_clear_error(&error); - val = FALSE; + val = g_key_file_get_boolean(keyfile_def, "device_Wireless", "Powered", &error); + if (error != NULL) { + g_clear_error(&error); + val = FALSE; + } } g_key_file_set_boolean(keyfile, "WiFi", @@ -490,7 +498,11 @@ void __connman_storage_migrate() "Enable", &error); if (error != NULL) { g_clear_error(&error); - val = FALSE; + val = g_key_file_get_boolean(keyfile_def, "device_Bluetooth", "Powered", &error); + if (error != NULL) { + g_clear_error(&error); + val = FALSE; + } } g_key_file_set_boolean(keyfile, "Bluetooth", @@ -500,7 +512,11 @@ void __connman_storage_migrate() "Enable", &error); if (error != NULL) { g_clear_error(&error); - val = FALSE; + val = g_key_file_get_boolean(keyfile_def, "device_Ethernet", "Powered", &error); + if (error != NULL) { + g_clear_error(&error); + val = FALSE; + } } g_key_file_set_boolean(keyfile, "Wired", @@ -510,7 +526,11 @@ void __connman_storage_migrate() "Enable", &error); if (error != NULL) { g_clear_error(&error); - val = FALSE; + val = g_key_file_get_boolean(keyfile_def, "device_Cellular", "Powered", &error); + if (error != NULL) { + g_clear_error(&error); + val = FALSE; + } } g_key_file_set_boolean(keyfile, "Cellular", @@ -520,7 +540,11 @@ void __connman_storage_migrate() "Enable", &error); if (error != NULL) { g_clear_error(&error); - val = FALSE; + val = g_key_file_get_boolean(keyfile_def, "device_WiMAX", "Powered", &error); + if (error != NULL) { + g_clear_error(&error); + val = FALSE; + } } g_key_file_set_boolean(keyfile, "WiMAX", |