← Back to branch summary

~ubuntu-branches/ubuntu/precise/network-manager/precise

« back to all changes in this revision

Viewing changes to src/nm-config.c

  • Committer: Package Import Robot
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2012-02-09 16:45:41 UTC
  • mfrom: (1.1.53)
  • Revision ID: package-import@ubuntu.com-20120209164541-4h90zknlsfdb7x35
Tags: 0.9.2.0+git201202091925.c721477-0ubuntu1
* upstream snapshot 2012-02-09 19:25:59 (GMT)
  + c721477d11d4fe144111d6d2eec8f93f2e9186c9
* debian/patches/avoid-periodic-disk-wakeups.patch: refreshed.
* debian/patches/nl3-default-ip6-route.patch: refreshed.
* debian/libnm-glib4.symbols: add symbols:
  + nm_active_connection_get_master@Base
  + nm_client_new_async@Base
  + nm_client_new_finish@Base
  + nm_remote_settings_new_async@Base
  + nm_remote_settings_new_finish@Base
  + nm_device_get_state_reason@Base
* debian/libnm-util2.symbols: add symbols:
  + nm_setting_802_1x_get_pac_file@Base
  + nm_setting_infiniband_get_transport_mode@Base

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/nm-config.c
224
224
                return NULL;
225
225
        }
226
226
 
 
227
        /* If for some reason no config file exists, and NM wasn't given on on
 
228
         * the command line, just use the default config file path.
 
229
         */
 
230
        if (config->path == NULL) {
 
231
                config->path = g_strdup (NM_DEFAULT_SYSTEM_CONF_FILE);
 
232
                fprintf (stderr, "No config file found or given; using %s\n",
 
233
                         NM_DEFAULT_SYSTEM_CONF_FILE);
 
234
        }
 
235
 
227
236
        /* ignore error if config file not found */
228
237
        g_clear_error (&local);
229
238
        return config;