diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-10-24 18:48:41 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-10-24 21:04:55 +0200 |
| commit | 0ba07000873749c80a7d868e6db3af4aef68ac3a (patch) | |
| tree | 8ffc33327085cf059c1ad8be4b3b99d1e2d2fcc8 | |
| parent | 25f625b4fc58f56b7ab84dbcfc155bc210f3ee66 (diff) | |
| download | NetworkManager-th/fix-doc-no-auto-default-file.tar.gz | |
man: fix no-auto-default state dir in NetworkManager.conf manualth/fix-doc-no-auto-default-file
Quote from `man NetworkManager.conf`:
When the default wired connection is deleted or saved to a new
persistent connection by a plugin, the device is added to a list in the
file /run/NetworkManager/no-auto-default.state to prevent creating
the default connection for that device again.
/run is obviously wrong. Fix it.
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | man/NetworkManager.conf.xml | 2 | ||||
| -rw-r--r-- | man/common.ent.in | 1 | ||||
| -rw-r--r-- | man/meson.build | 1 |
4 files changed, 4 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index d735627b67..d82ad47a03 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4148,6 +4148,7 @@ data_edit = sed \ -e 's|@sbindir[@]|$(sbindir)|g' \ -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ -e 's|@nmrundir[@]|$(nmrundir)|g' \ + -e 's|@nmstatedir[@]|$(nmstatedir)|g' \ -e 's|@localstatedir[@]|$(localstatedir)|g' \ -e 's|@libexecdir[@]|$(libexecdir)|g' \ -e 's|@DISTRO_NETWORK_SERVICE[@]|$(DISTRO_NETWORK_SERVICE)|g' \ diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml index 1e1d0aab15..8773e6e916 100644 --- a/man/NetworkManager.conf.xml +++ b/man/NetworkManager.conf.xml @@ -204,7 +204,7 @@ plugins-=remove-me <para>When the default wired connection is deleted or saved to a new persistent connection by a plugin, the device is added to a list in the file - <filename>/run/NetworkManager/no-auto-default.state</filename> + <filename>&nmstatedir;/no-auto-default.state</filename> to prevent creating the default connection for that device again.</para> <para>See <xref linkend="device-spec"/> for the syntax how to diff --git a/man/common.ent.in b/man/common.ent.in index ddfbb69a69..9632b4efba 100644 --- a/man/common.ent.in +++ b/man/common.ent.in @@ -2,6 +2,7 @@ <!ENTITY NM_VERSION "@NM_VERSION@"> <!ENTITY sysconfdir "@sysconfdir@"> <!ENTITY nmrundir "@nmrundir@"> +<!ENTITY nmstatedir "@nmstatedir@"> <!ENTITY NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT "@NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT@"> <!ENTITY NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT "@NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT@"> <!ENTITY NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT "@NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT@"> diff --git a/man/meson.build b/man/meson.build index 21fac21d1d..4c33ff30e8 100644 --- a/man/meson.build +++ b/man/meson.build @@ -2,6 +2,7 @@ common_conf = configuration_data() common_conf.set('NM_VERSION', nm_version) common_conf.set('sysconfdir', nm_sysconfdir) common_conf.set('nmrundir', nm_pkgrundir) +common_conf.set('nmstatedir', nm_pkgstatedir) common_conf.set('NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT', config_default_main_auth_polkit) common_conf.set('NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT', config_logging_backend_default) common_conf.set('NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT', config_default_logging_audit) |