summaryrefslogtreecommitdiff
path: root/recipes/networkmanager/networkmanager
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2009-10-02 18:51:44 +0200
committerKoen Kooi <koen@openembedded.org>2009-10-02 18:51:44 +0200
commit37c479af567b53177d5f1cdd20ab87ac9de5a3b2 (patch)
tree263f105d62771971408dec14fb1fbcafce421f2c /recipes/networkmanager/networkmanager
parent86e8a48d0a6f9a287c409f4ae5e1b0cb86abb28e (diff)
networkmanager: add git bits for nm and nm-applet
Diffstat (limited to 'recipes/networkmanager/networkmanager')
-rwxr-xr-xrecipes/networkmanager/networkmanager/NetworkManager69
-rw-r--r--recipes/networkmanager/networkmanager/cx3110_bring_up.patch20
-rw-r--r--recipes/networkmanager/networkmanager/disable_wireless_by_default.patch22
-rw-r--r--recipes/networkmanager/networkmanager/nm-system-settings.conf6
4 files changed, 117 insertions, 0 deletions
diff --git a/recipes/networkmanager/networkmanager/NetworkManager b/recipes/networkmanager/networkmanager/NetworkManager
new file mode 100755
index 0000000000..4cde8cc003
--- /dev/null
+++ b/recipes/networkmanager/networkmanager/NetworkManager
@@ -0,0 +1,69 @@
+#! /bin/sh
+#
+# NetworkManager NetworkManager daemon
+# Daemon for automatically switching network
+# connections to the best available connection.
+# This file should be placed in /etc/init.d.
+#
+# Authors: <j@bootlab.org>
+# Mark Roach <mrroach@okmaybe.com>
+# Thom May <thom@debian.org>
+#
+# Version: @(#)skeleton 2.85-23 28-Jul-2004 miquels@cistron.nl
+#
+
+set -e
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DESC="Network connection manager daemon"
+NAME="NetworkManager"
+DAEMON=/usr/sbin/$NAME
+PIDFILE=/var/run/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+USER=root
+
+# Gracefully exit if the package has been removed.
+test -x $DAEMON || exit 0
+
+#
+# Function that starts the daemon/service.
+#
+d_start() {
+ start-stop-daemon --start --quiet --pidfile $PIDFILE \
+ --user $USER --exec $DAEMON -- $DAEMON_OPTS
+}
+
+#
+# Function that stops the daemon/service.
+#
+d_stop() {
+ start-stop-daemon --stop --quiet --pidfile $PIDFILE \
+ --oknodo --user $USER --exec $DAEMON
+}
+
+
+case "$1" in
+ start)
+ echo -n "Starting $DESC: $NAME"
+ d_start
+ echo "."
+ ;;
+ stop)
+ echo -n "Stopping $DESC: $NAME"
+ d_stop
+ echo "."
+ ;;
+ restart|force-reload)
+ echo -n "Restarting $DESC: $NAME"
+ d_stop
+ sleep 1
+ d_start
+ echo "."
+ ;;
+ *)
+ echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
+ exit 1
+ ;;
+esac
+
+exit 0
diff --git a/recipes/networkmanager/networkmanager/cx3110_bring_up.patch b/recipes/networkmanager/networkmanager/cx3110_bring_up.patch
new file mode 100644
index 0000000000..db420ce2ba
--- /dev/null
+++ b/recipes/networkmanager/networkmanager/cx3110_bring_up.patch
@@ -0,0 +1,20 @@
+Index: NetworkManager-0.7.0/src/nm-device-wifi.c
+===================================================================
+--- NetworkManager-0.7.0.orig/src/nm-device-wifi.c
++++ NetworkManager-0.7.0/src/nm-device-wifi.c
+@@ -364,6 +364,15 @@ real_get_generic_capabilities (NMDevice
+ const char *iface = nm_device_get_iface (dev);
+ gboolean success;
+
++ /* The cx3110 driver has to be UP in order to get its capabilities. */
++ gboolean no_firmware = FALSE;
++ const char *driver = nm_device_get_driver (dev);
++ if (driver && !strcmp ("wlan-omap", driver) && !nm_system_device_is_up (dev)) {
++ if (!nm_device_hw_bring_up (dev, TRUE, &no_firmware))
++ nm_warning ("(%s): couldn't bring up interface to get capabilities.",
++ iface);
++ }
++
+ memset (&range, 0, sizeof (struct iw_range));
+ success = wireless_get_range (NM_DEVICE_WIFI (dev), &range, &response_len);
+ if (!success)
diff --git a/recipes/networkmanager/networkmanager/disable_wireless_by_default.patch b/recipes/networkmanager/networkmanager/disable_wireless_by_default.patch
new file mode 100644
index 0000000000..d194d96ea5
--- /dev/null
+++ b/recipes/networkmanager/networkmanager/disable_wireless_by_default.patch
@@ -0,0 +1,22 @@
+Index: NetworkManager-0.7.0/src/nm-manager.c
+===================================================================
+--- NetworkManager-0.7.0.orig/src/nm-manager.c 2009-01-15 17:23:09.000000000 -0300
++++ NetworkManager-0.7.0/src/nm-manager.c 2009-01-15 17:32:36.000000000 -0300
+@@ -286,7 +286,7 @@
+ DBusGConnection *g_connection;
+ guint id;
+
+- priv->wireless_enabled = TRUE;
++ priv->wireless_enabled = FALSE;
+ priv->wireless_hw_enabled = TRUE;
+ priv->sleeping = FALSE;
+ priv->state = NM_STATE_DISCONNECTED;
+@@ -613,7 +613,7 @@
+ g_param_spec_boolean (NM_MANAGER_WIRELESS_ENABLED,
+ "WirelessEnabled",
+ "Is wireless enabled",
+- TRUE,
++ FALSE,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property
diff --git a/recipes/networkmanager/networkmanager/nm-system-settings.conf b/recipes/networkmanager/networkmanager/nm-system-settings.conf
new file mode 100644
index 0000000000..fb9ef1ff97
--- /dev/null
+++ b/recipes/networkmanager/networkmanager/nm-system-settings.conf
@@ -0,0 +1,6 @@
+[main]
+plugins=ifupdown,keyfile
+
+[ifupdown]
+managed=true
+