diff options
| author | Koen Kooi <koen@openembedded.org> | 2009-10-02 14:44:24 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-10-02 14:44:24 +0200 |
| commit | 80891610ead222418a20a358b7bdb892fa676546 (patch) | |
| tree | 16f2efdee9311322c8daf158d689364aaf0a27ce /recipes/networkmanager | |
| parent | fb82cf69a9114da395d8f4b452fc53423d077422 (diff) | |
network manager: work around some dbus at_console problems
Diffstat (limited to 'recipes/networkmanager')
4 files changed, 52 insertions, 0 deletions
diff --git a/recipes/networkmanager/network-manager-applet/nm-applet.conf b/recipes/networkmanager/network-manager-applet/nm-applet.conf new file mode 100644 index 0000000000..109b00f435 --- /dev/null +++ b/recipes/networkmanager/network-manager-applet/nm-applet.conf @@ -0,0 +1,34 @@ +<!DOCTYPE busconfig PUBLIC + "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> +<busconfig> + <policy user="root"> + <allow own="org.freedesktop.NetworkManagerUserSettings"/> + + <allow send_destination="org.freedesktop.NetworkManagerUserSettings"/> + + <!-- Only root can get secrets --> + <allow send_destination="org.freedesktop.NetworkManagerUserSettings" + send_interface="org.freedesktop.NetworkManagerSettings.Connection.Secrets"/> + </policy> + <policy at_console="true"> + <allow own="org.freedesktop.NetworkManagerUserSettings"/> + + <allow send_destination="org.freedesktop.NetworkManagerUserSettings"/> + + <!-- Only root can get secrets --> + <deny send_destination="org.freedesktop.NetworkManagerUserSettings" + send_interface="org.freedesktop.NetworkManagerSettings.Connection.Secrets"/> + </policy> + <policy context="default"> + <allow own="org.freedesktop.NetworkManagerUserSettings"/> + + <allow send_destination="org.freedesktop.NetworkManagerUserSettings"/> + + <allow send_destination="org.freedesktop.NetworkManagerUserSettings" + send_interface="org.freedesktop.DBus.Introspectable"/> + </policy> + + <limit name="max_replies_per_connection">512</limit> +</busconfig> + diff --git a/recipes/networkmanager/network-manager-applet_0.7.1.bb b/recipes/networkmanager/network-manager-applet_0.7.1.bb index 8d5a364181..4e55714a22 100644 --- a/recipes/networkmanager/network-manager-applet_0.7.1.bb +++ b/recipes/networkmanager/network-manager-applet_0.7.1.bb @@ -3,8 +3,17 @@ LICENSE = "GPL" DEPENDS = "libnotify networkmanager dbus-glib libglade gconf gnome-keyring" RDEPENDS = "networkmanager" +PR = "r1" + inherit gnome +SRC_URI += "file://nm-applet.conf" + +# Hack around dbus a_console problems +do_install_append() { + install -m 0644 ${WORKDIR}/nm-applet.conf ${D}${sysconfdir}/dbus-1/system.d/ +} + FILES_${PN} += "${datadir}/nm-applet/ \ ${datadir}/gnome-vpn-properties/ \ ${datadir}/gnome/autostart/ \ diff --git a/recipes/networkmanager/networkmanager-0.7.inc b/recipes/networkmanager/networkmanager-0.7.inc index a19cd9ff5c..3494aa7ae3 100644 --- a/recipes/networkmanager/networkmanager-0.7.inc +++ b/recipes/networkmanager/networkmanager-0.7.inc @@ -25,6 +25,13 @@ do_stage () { autotools_stage_all } +# Work around dbus permission problems since we lack a proper at_console +do_install_prepend() { + sed -i -e s:deny:allow:g ${S}/src/NetworkManager.conf + sed -i -e s:deny:allow:g ${S}/system-settings/src/nm-system-settings.conf + sed -i -e s:deny:allow:g ${S}/callouts/nm-dispatcher.conf +} + do_install_append () { install -d ${D}/etc/default/volatiles install -d ${D}/etc/dbus-1/event.d diff --git a/recipes/networkmanager/networkmanager_0.7.1.bb b/recipes/networkmanager/networkmanager_0.7.1.bb index fc97a8a29c..6e4303c520 100644 --- a/recipes/networkmanager/networkmanager_0.7.1.bb +++ b/recipes/networkmanager/networkmanager_0.7.1.bb @@ -1,5 +1,7 @@ require networkmanager-0.7.inc +PR = "r1" + SRC_URI += " \ file://remove-gtk-doc-make.patch;patch=1 \ file://008-BACKEND-debian-fallback-to-generic-loopback.loom.patch;patch=1 \ |