colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

main: create /run/NetworkManager/devices runtime directory

Browse Source
This commit is contained in:
Thomas Haller
2016-04-04 18:18:49 +02:00
parent 1a257a6752
commit 1eca446c8c
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main-utils.c
View File

@@ -34,6 +34,7 @@
#include "main-utils.h" #include "main-utils.h"
#include "NetworkManagerUtils.h" #include "NetworkManagerUtils.h"
#include "nm-config.h"
static gboolean static gboolean
sighup_handler (gpointer user_data) sighup_handler (gpointer user_data)
@@ -139,11 +140,23 @@ nm_main_utils_ensure_statedir ()
void void
nm_main_utils_ensure_rundir () nm_main_utils_ensure_rundir ()
{ {
int errsv;
/* Setup runtime directory */ /* Setup runtime directory */
if (g_mkdir_with_parents (NMRUNDIR, 0755) != 0) { if (g_mkdir_with_parents (NMRUNDIR, 0755) != 0) {
fprintf (stderr, _("Cannot create '%s': %s"), NMRUNDIR, strerror (errno)); errsv = errno;
fprintf (stderr, _("Cannot create '%s': %s"), NMRUNDIR, g_strerror (errsv));
exit (1); exit (1);
} }
nm_assert (g_str_has_prefix (NM_CONFIG_DEVICE_STATE_DIR, NMRUNDIR"/"));
if (g_mkdir (NM_CONFIG_DEVICE_STATE_DIR, 0755) != 0) {
errsv = errno;
if (errsv != EEXIST) {
fprintf (stderr, _("Cannot create '%s': %s"), NM_CONFIG_DEVICE_STATE_DIR, g_strerror (errsv));
exit (1);
}
}
} }
/** /**

6
src/nm-config.h
View File

@@ -185,5 +185,11 @@ gboolean nm_config_set_global_dns (NMConfig *self, NMGlobalDnsConfig *global_dns
extern guint _nm_config_match_nm_version; extern guint _nm_config_match_nm_version;
extern char *_nm_config_match_env; extern char *_nm_config_match_env;
/*****************************************************************************/
#define NM_CONFIG_DEVICE_STATE_DIR ""NMRUNDIR"/devices"
/*****************************************************************************/
#endif /* __NETWORKMANAGER_CONFIG_H__ */ #endif /* __NETWORKMANAGER_CONFIG_H__ */