summaryrefslogtreecommitdiff
path: root/network/NetworkManager
diff options
context:
space:
mode:
authorRobby Workman <rworkman@slackbuilds.org>2010-08-22 11:49:16 -0500
committerErik Hanson <erik@slackbuilds.org>2010-08-23 00:53:22 -0500
commitc6c85f937cc41ff53b67c32ded31f3d2d7ee289f (patch)
treea1f223fb01a523aa01aca0b74df6a22e93eaa0b2 /network/NetworkManager
parente77b944f1f204681a0e0efef7e1fa0b57252be45 (diff)
downloadslackbuilds-c6c85f937cc41ff53b67c32ded31f3d2d7ee289f.tar.gz
network/NetworkManager: Minor default config changes
This commit sets dhcpcd as the dhcp client for NM to use and adds some comments to /etc/NetworkManager/nm-system-settings.conf so that it's clearer where to look for more information... Thanks to Dan Williams (NM Upstream Dev) for help with this. Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'network/NetworkManager')
-rw-r--r--network/NetworkManager/NetworkManager.SlackBuild4
-rw-r--r--network/NetworkManager/nm-system-settings.conf.new5
2 files changed, 8 insertions, 1 deletions
diff --git a/network/NetworkManager/NetworkManager.SlackBuild b/network/NetworkManager/NetworkManager.SlackBuild
index c4b8b5aeac..2ff696cc80 100644
--- a/network/NetworkManager/NetworkManager.SlackBuild
+++ b/network/NetworkManager/NetworkManager.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=NetworkManager
VERSION=${VERSION:-0.8.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -98,6 +98,8 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
mv $PKG/etc/rc.d/rc.networkmanager $PKG/etc/rc.d/rc.networkmanager.new
# Add a 'starter' nm-system-settings.conf file
+# This sets the hostname (during postinstall) to match the system's name
+# and defines dhcpcd as the dhcp client to use
mkdir -p $PKG/etc/NetworkManager
cat $CWD/nm-system-settings.conf.new > \
$PKG/etc/NetworkManager/nm-system-settings.conf.new
diff --git a/network/NetworkManager/nm-system-settings.conf.new b/network/NetworkManager/nm-system-settings.conf.new
index eca86b84f8..9a57be16bd 100644
--- a/network/NetworkManager/nm-system-settings.conf.new
+++ b/network/NetworkManager/nm-system-settings.conf.new
@@ -1,5 +1,10 @@
+# /etc/NetworkManager/nm-system-settings.conf
+#
+# See NetworkManager.conf(5) for more information on this file
+
[main]
plugins=keyfile
+dhcp=dhcpcd
[keyfile]
hostname=yourhostname