diff options
| author | Michael Biebl <biebl@debian.org> | 2019-04-21 21:10:42 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2019-04-21 21:10:42 +0200 |
| commit | 1761e93f84aba1f3a2f0ebc3d753303f27395fed (patch) | |
| tree | 2a0aa70159a57641294d4aee7aee061bc25c0a7b /examples | |
| parent | 6cbf8459e4602877369dbf20c6597708725758c6 (diff) | |
| parent | 85563b7fc7ec2cd21e38debb9b28db342e2e8e7c (diff) | |
Update upstream source from tag 'upstream/1.18.0'
Update to upstream version '1.18.0' with Debian dir c79ce54aa2bd35bd9bd13eb01cf8687eaae2c0c1
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/C/glib/meson.build | 2 | ||||
| -rw-r--r-- | examples/nm-conf.d/31-mac-addr-change.conf | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/examples/C/glib/meson.build b/examples/C/glib/meson.build index 1c817163..47d64bdd 100644 --- a/examples/C/glib/meson.build +++ b/examples/C/glib/meson.build @@ -14,6 +14,6 @@ foreach example: examples example[0], [example[0] + '.c'] + example[1], include_directories: example[2], - dependencies: [nm_core_dep] + example[3], + dependencies: [libnm_core_dep] + example[3], ) endforeach diff --git a/examples/nm-conf.d/31-mac-addr-change.conf b/examples/nm-conf.d/31-mac-addr-change.conf index 554b698f..f32507a1 100644 --- a/examples/nm-conf.d/31-mac-addr-change.conf +++ b/examples/nm-conf.d/31-mac-addr-change.conf @@ -5,12 +5,15 @@ # # https://bugzilla.gnome.org/show_bug.cgi?id=777523 [device-31-mac-addr-change] -match-device=driver:rtl8723bs,driver:rtl8189es,driver:r8188eu,driver:eagle_sdio +match-device=driver:eagle_sdio,driver:wl wifi.scan-rand-mac-address=no [connection-31-mac-addr-change] -match-device=driver:rtl8723bs,driver:rtl8189es,driver:r8188eu,driver:eagle_sdio -# these are per-profile properties. Here we overwrite the default -# value, but explicitly configuring it in the profile takes precedence. +# These are defaults for the connection profile. Here we set only the default +# value. Note that the default value already should be "preserve", so this has +# no actual effect. +# +# Also note that this is only the default. Per-profile settings still take +# precedence. +match-device=driver:eagle_sdio,driver:wl wifi.cloned-mac-address=preserve -ethernet.cloned-mac-address=preserve |