[arch-commits] Commit in networkmanager/trunk (3 files)

[Jan Steffens]

    Date: Wednesday, May 6, 2015 @ 20:27:39
  Author: heftig
Revision: 238555

FS#44878 resolvconf

Modified:
  networkmanager/trunk/NetworkManager.conf
  networkmanager/trunk/PKGBUILD
  networkmanager/trunk/networkmanager.install

------------------------+
 NetworkManager.conf    |    4 ++++
 PKGBUILD               |    4 ++--
 networkmanager.install |    8 +++++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

Modified: NetworkManager.conf
===================================================================
--- NetworkManager.conf	2015-05-06 18:09:15 UTC (rev 238554)
+++ NetworkManager.conf	2015-05-06 18:27:39 UTC (rev 238555)
@@ -1,5 +1,8 @@
 [main]
 plugins=keyfile
+dhcp=dhclient
+dns=default
+rc-manager=none
 
 ## Set static hostname
 #[keyfile]
@@ -8,3 +11,4 @@
 ## HTTP-based connectivity check
 #[connectivity]
 #uri=http://nmcheck.gnome.org/check_network_status.txt
+#interval=100

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-05-06 18:09:15 UTC (rev 238554)
+++ PKGBUILD	2015-05-06 18:27:39 UTC (rev 238555)
@@ -9,7 +9,7 @@
 pkgbase=networkmanager
 pkgname=(networkmanager libnm-glib)
 pkgver=1.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Network Management daemon"
 arch=(i686 x86_64)
 license=(GPL2 LGPL2.1)
@@ -23,7 +23,7 @@
 source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/${pkgver:0:3}/NetworkManager-$pkgver.tar.xz
         NetworkManager.conf disable_set_hostname.patch)
 sha256sums=('359385707494bedbb48cfe0992ccfbcc4ac147dae1f7a47055c71e96439508ff'
-            '759db295ddae7a6dc6b29211fc0ec08695f875584d456dd146d3679e2c33e2e3'
+            '9cf2cc3f55f20e6bb4fddb335311d124991c4c65633a2b3d638c66f41333ae11'
             '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460')
 
 prepare() {

Modified: networkmanager.install
===================================================================
--- networkmanager.install	2015-05-06 18:09:15 UTC (rev 238554)
+++ networkmanager.install	2015-05-06 18:27:39 UTC (rev 238555)
@@ -1,9 +1,15 @@
 post_upgrade() {
-  (( $(vercmp 0.8.3 $2) > 0 )) && cat <<MSG
+  (( $(vercmp $2 0.8.3) < 0 )) && cat <<MSG
 ATTENTION:
   /etc/NetworkManager/nm-system-settings.conf has been replaced
   by /etc/NetworkManager/NetworkManager.conf. Make sure you move
   any custom settings to the new config file.
 MSG
+  (( $(vercmp $2 1.0.2-2) < 0 )) && cat <<MSG
+ATTENTION:
+  NetworkManager does not automatically use resolvconf for managing resolv.conf
+  anymore. If you were depending on the use of resolvconf (probably not), then
+  set rc-manager=resolvconf in /etc/NetworkManager/NetworkManager.conf.
+MSG
   true
 }