diff options
| author | Ross Burton <ross@openedhand.com> | 2008-07-04 14:14:21 +0000 |
|---|---|---|
| committer | Ross Burton <ross@openedhand.com> | 2008-07-04 14:14:21 +0000 |
| commit | 670fd324bffd5b6e47c2dcf5e58a7f46026be971 (patch) | |
| tree | 5efd4e845b15057d210c918dbda5fdfa234640fb | |
| parent | 56ff3a1efb3b17f628321bb9ade3b7fb3bf23f08 (diff) | |
| download | openembedded-core-670fd324bffd5b6e47c2dcf5e58a7f46026be971.tar.gz openembedded-core-670fd324bffd5b6e47c2dcf5e58a7f46026be971.tar.bz2 openembedded-core-670fd324bffd5b6e47c2dcf5e58a7f46026be971.tar.xz openembedded-core-670fd324bffd5b6e47c2dcf5e58a7f46026be971.zip | |
networkmanager: use a proper init script with depends
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4828 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -rw-r--r-- | meta/packages/networkmanager/files/NetworkManager (renamed from meta/packages/networkmanager/files/25NetworkManager) | 13 | ||||
| -rw-r--r-- | meta/packages/networkmanager/networkmanager_svn.bb | 13 |
2 files changed, 20 insertions, 6 deletions
diff --git a/meta/packages/networkmanager/files/25NetworkManager b/meta/packages/networkmanager/files/NetworkManager index 676fde35c..4522e0107 100644 --- a/meta/packages/networkmanager/files/25NetworkManager +++ b/meta/packages/networkmanager/files/NetworkManager @@ -1,6 +1,17 @@ #!/bin/sh # -# NetworkManager startup script +### BEGIN INIT INFO +# Provides: NetworkManager +# Required-Start: $remote_fs dbus hal +# Required-Stop: $remote_fs dbus hal +# Should-Start: $syslog +# Should-Stop: $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: network connection manager +# Description: Daemon for automatically switching network +# connections to the best available connection. +### END INIT INFO . /etc/profile diff --git a/meta/packages/networkmanager/networkmanager_svn.bb b/meta/packages/networkmanager/networkmanager_svn.bb index d39220bf6..58a15aaa2 100644 --- a/meta/packages/networkmanager/networkmanager_svn.bb +++ b/meta/packages/networkmanager/networkmanager_svn.bb @@ -7,12 +7,12 @@ DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools ppp gnome-common" RDEPENDS = "hal wpa-supplicant iproute2 dhcp-client" PV = "0.7+svnr${SRCREV}" -PR = "r5" +PR = "r6" SRC_URI="svn://svn.gnome.org/svn/NetworkManager/;module=trunk;proto=http \ file://no-restarts.diff;patch=1;pnum=0 \ file://makefile-fix.patch;patch=1 \ - file://25NetworkManager \ + file://NetworkManager \ file://99_networkmanager" EXTRA_OECONF = " \ @@ -22,13 +22,16 @@ EXTRA_OECONF = " \ S = "${WORKDIR}/trunk" -inherit autotools pkgconfig +inherit autotools pkgconfig update-rc.d + +INITSCRIPT_NAME = "NetworkManager" +INITSCRIPT_PARAMS = "defaults 22" do_install_append () { install -d ${D}/etc/default/volatiles install -m 0644 ${WORKDIR}/99_networkmanager ${D}/etc/default/volatiles - install -d ${D}/etc/dbus-1/event.d - install -m 0755 ${WORKDIR}/25NetworkManager ${D}/etc/dbus-1/event.d + # This overwrites the provided init script + install -m 0755 ${WORKDIR}/NetworkManager ${D}/etc/init.d/ } do_stage () { |