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>
This commit is contained in:
Robby Workman 2010-08-22 11:49:16 -05:00 committed by Erik Hanson
parent e77b944f1f
commit c6c85f937c
2 changed files with 8 additions and 1 deletions

View file

@ -24,7 +24,7 @@
PRGNAM=NetworkManager PRGNAM=NetworkManager
VERSION=${VERSION:-0.8.1} VERSION=${VERSION:-0.8.1}
BUILD=${BUILD:-1} BUILD=${BUILD:-2}
TAG=${TAG:-_SBo} TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then 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 mv $PKG/etc/rc.d/rc.networkmanager $PKG/etc/rc.d/rc.networkmanager.new
# Add a 'starter' nm-system-settings.conf file # 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 mkdir -p $PKG/etc/NetworkManager
cat $CWD/nm-system-settings.conf.new > \ cat $CWD/nm-system-settings.conf.new > \
$PKG/etc/NetworkManager/nm-system-settings.conf.new $PKG/etc/NetworkManager/nm-system-settings.conf.new

View file

@ -1,5 +1,10 @@
# /etc/NetworkManager/nm-system-settings.conf
#
# See NetworkManager.conf(5) for more information on this file
[main] [main]
plugins=keyfile plugins=keyfile
dhcp=dhcpcd
[keyfile] [keyfile]
hostname=yourhostname hostname=yourhostname