diff options
| author | Jan Luebbe <jlu@pengutronix.de> | 2012-02-09 12:52:29 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-02-10 15:14:23 +0100 |
| commit | 859ed7494212f66dc78e22dfccc875d1cad43d22 (patch) | |
| tree | 03b9265fd27737629306ea3c38c8a0fe880b5bb9 /rules/networkmanager.in | |
| parent | 57fa4c6cf029c52271afb5d1f27e5ddc52f40056 (diff) | |
| download | ptxdist-859ed7494212f66dc78e22dfccc875d1cad43d22.tar.gz ptxdist-859ed7494212f66dc78e22dfccc875d1cad43d22.tar.xz | |
networkmanager: update and fix Network Manager, support systemd, handle NFS root
Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/networkmanager.in')
| -rw-r--r-- | rules/networkmanager.in | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/rules/networkmanager.in b/rules/networkmanager.in index e29c5d562..ac895b71e 100644 --- a/rules/networkmanager.in +++ b/rules/networkmanager.in @@ -1,19 +1,36 @@ -## SECTION=shell_and_console +## SECTION=networking -config NETWORKMANAGER +menuconfig NETWORKMANAGER tristate - depends on BROKEN + select DHCP + select DHCP_CLIENT select WIRELESS + select UDEV + select UDEV_LIBGUDEV select DBUS_GLIB select LIBNL select LIBUUID - # FIXME: hal can be configured without policy-kit, but networkmanager depends on it - select HAL - select HAL_POLKIT - prompt "networkmanager" + select WPA_SUPPLICANT + select GNUTLS + select HOST_INTLTOOL + prompt "networkmanager " help NetworkManager is a tool to automate network configuration as far as possible. The project web site is here: http://projects.gnome.org/NetworkManager/ +if NETWORKMANAGER + +config NETWORKMANAGER_STARTSCRIPT + bool + default y + prompt "install /etc/init.d/NetworkManager" + +config NETWORKMANAGER_SYSTEMD_UNIT + bool + default y + depends on SYSTEMD + prompt "install systemd unit files for Network Manager" + +endif |