projects
/
platform
/
upstream
/
connman.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Disabled in container environment
[platform/upstream/connman.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index
34d572d
..
2dae72a
100755
(executable)
--- a/
src/main.c
+++ b/
src/main.c
@@
-48,6
+48,7
@@
#if defined TIZEN_EXT
#define DEFAULT_WIFI_INTERFACE "wlan0"
#if defined TIZEN_EXT
#define DEFAULT_WIFI_INTERFACE "wlan0"
+#define CONTAINER_FILE "/run/systemd/container"
#endif
#define MAINFILE "main.conf"
#endif
#define MAINFILE "main.conf"
@@
-766,6
+767,8
@@
static void parse_config(GKeyFile *config)
connman_settings.auto_connect =
parse_service_types(default_auto_connect, CONF_ARRAY_SIZE(default_auto_connect));
connman_settings.auto_connect =
parse_service_types(default_auto_connect, CONF_ARRAY_SIZE(default_auto_connect));
+ g_strfreev(str_list);
+
g_clear_error(&error);
str_list = __connman_config_get_string_list(config, "General",
g_clear_error(&error);
str_list = __connman_config_get_string_list(config, "General",
@@
-1357,6
+1360,15
@@
int main(int argc, char *argv[])
signal = setup_signalfd();
signal = setup_signalfd();
+#if defined TIZEN_EXT
+ if (access(CONTAINER_FILE, F_OK) == 0) {
+ g_main_loop_run(main_loop);
+
+ g_source_remove(signal);
+ return 0;
+ }
+#endif
+
dbus_error_init(&err);
conn = g_dbus_setup_bus(DBUS_BUS_SYSTEM, CONNMAN_SERVICE, &err);
dbus_error_init(&err);
conn = g_dbus_setup_bus(DBUS_BUS_SYSTEM, CONNMAN_SERVICE, &err);