diff options
| -rw-r--r-- | meta-networking/recipes-connectivity/networkmanager/networkmanager/networkmanager.initd | 110 | ||||
| -rw-r--r-- | meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.2.bb | 6 |
2 files changed, 115 insertions, 1 deletions
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/networkmanager.initd b/meta-networking/recipes-connectivity/networkmanager/networkmanager/networkmanager.initd new file mode 100644 index 0000000000..4fdd80d410 --- /dev/null +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/networkmanager.initd | |||
| @@ -0,0 +1,110 @@ | |||
| 1 | #! /bin/sh | ||
| 2 | ### BEGIN INIT INFO | ||
| 3 | # Provides: network-manager | ||
| 4 | # Required-Start: $remote_fs dbus udev | ||
| 5 | # Required-Stop: $remote_fs dbus udev | ||
| 6 | # Should-Start: $syslog | ||
| 7 | # Should-Stop: $syslog | ||
| 8 | # Default-Start: 2 3 4 5 | ||
| 9 | # Default-Stop: 0 1 6 | ||
| 10 | # Short-Description: network connection manager | ||
| 11 | # Description: Daemon for automatically switching network | ||
| 12 | # connections to the best available connection. | ||
| 13 | ### END INIT INFO | ||
| 14 | |||
| 15 | PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin | ||
| 16 | DESC="network connection manager" | ||
| 17 | NAME="NetworkManager" | ||
| 18 | |||
| 19 | DAEMON=/usr/sbin/$NAME | ||
| 20 | |||
| 21 | PIDFILE=/run/$NAME/$NAME.pid | ||
| 22 | |||
| 23 | SCRIPTNAME=/etc/init.d/network-manager | ||
| 24 | |||
| 25 | . /etc/init.d/functions || exit 1 | ||
| 26 | |||
| 27 | # Exit if the package is not installed | ||
| 28 | [ -x "$DAEMON" ] || exit 0 | ||
| 29 | |||
| 30 | log_daemon_msg() { | ||
| 31 | echo -n $* | ||
| 32 | } | ||
| 33 | |||
| 34 | log_end_msg() { | ||
| 35 | if [ $1 -eq 0 ]; then | ||
| 36 | success | ||
| 37 | else | ||
| 38 | failure | ||
| 39 | fi | ||
| 40 | echo | ||
| 41 | } | ||
| 42 | |||
| 43 | log_progress_msg () { | ||
| 44 | if [ -z "${1:-}" ]; then | ||
| 45 | return 1 | ||
| 46 | fi | ||
| 47 | echo -n " $@" | ||
| 48 | } | ||
| 49 | |||
| 50 | # | ||
| 51 | # Function that starts the daemon/service. | ||
| 52 | # | ||
| 53 | d_start() { | ||
| 54 | start-stop-daemon --start --quiet --pidfile $PIDFILE \ | ||
| 55 | --exec $DAEMON -- $DAEMON_OPTS | ||
| 56 | } | ||
| 57 | |||
| 58 | # | ||
| 59 | # Function that stops the daemon/service. | ||
| 60 | # | ||
| 61 | d_stop() { | ||
| 62 | start-stop-daemon --stop --retry 5 --quiet --pidfile $PIDFILE \ | ||
| 63 | --exec $DAEMON | ||
| 64 | } | ||
| 65 | |||
| 66 | d_reload() { | ||
| 67 | start-stop-daemon --stop --signal HUP --quiet --pidfile $PIDFILE \ | ||
| 68 | --exec $DAEMON | ||
| 69 | } | ||
| 70 | |||
| 71 | case "$1" in | ||
| 72 | start) | ||
| 73 | log_daemon_msg "Starting $DESC" "$NAME" | ||
| 74 | d_start | ||
| 75 | case "$?" in | ||
| 76 | 0) log_end_msg 0 ;; | ||
| 77 | 1) log_progress_msg "already started" | ||
| 78 | log_end_msg 0 ;; | ||
| 79 | *) log_end_msg 1 ;; | ||
| 80 | esac | ||
| 81 | ;; | ||
| 82 | stop) | ||
| 83 | log_daemon_msg "Stopping $DESC" "$NAME" | ||
| 84 | d_stop | ||
| 85 | case "$?" in | ||
| 86 | 0) log_end_msg 0 ;; | ||
| 87 | 1) log_progress_msg "already stopped" | ||
| 88 | log_end_msg 0 ;; | ||
| 89 | *) log_end_msg 1 ;; | ||
| 90 | esac | ||
| 91 | ;; | ||
| 92 | reload|force-reload) | ||
| 93 | log_daemon_msg "Reloading $DESC" "$NAME" | ||
| 94 | d_reload | ||
| 95 | log_end_msg $? | ||
| 96 | ;; | ||
| 97 | restart) | ||
| 98 | $0 stop | ||
| 99 | $0 start | ||
| 100 | ;; | ||
| 101 | status) | ||
| 102 | status_of_proc -p $PIDFILE $DAEMON $NAME && exit 0 || exit $? | ||
| 103 | ;; | ||
| 104 | *) | ||
| 105 | echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload|status}" >&2 | ||
| 106 | exit 1 | ||
| 107 | ;; | ||
| 108 | esac | ||
| 109 | |||
| 110 | exit 0 | ||
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.2.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.2.bb index 3c220ec777..db69a5e77c 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.2.bb +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.2.bb | |||
| @@ -19,10 +19,11 @@ DEPENDS = " \ | |||
| 19 | curl \ | 19 | curl \ |
| 20 | " | 20 | " |
| 21 | 21 | ||
| 22 | inherit gnomebase gettext systemd bash-completion vala gobject-introspection gtk-doc update-alternatives | 22 | inherit gnomebase gettext update-rc.d systemd bash-completion vala gobject-introspection gtk-doc update-alternatives |
| 23 | 23 | ||
| 24 | SRC_URI = " \ | 24 | SRC_URI = " \ |
| 25 | ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \ | 25 | ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \ |
| 26 | file://${BPN}.initd \ | ||
| 26 | file://0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch \ | 27 | file://0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch \ |
| 27 | file://0002-Do-not-create-settings-settings-property-documentati.patch \ | 28 | file://0002-Do-not-create-settings-settings-property-documentati.patch \ |
| 28 | " | 29 | " |
| @@ -130,6 +131,7 @@ FILES_${PN}-nmtui-doc = " \ | |||
| 130 | ${mandir}/man1/nmtui* \ | 131 | ${mandir}/man1/nmtui* \ |
| 131 | " | 132 | " |
| 132 | 133 | ||
| 134 | INITSCRIPT_NAME = "network-manager" | ||
| 133 | SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'NetworkManager.service NetworkManager-dispatcher.service', '', d)}" | 135 | SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'NetworkManager.service NetworkManager-dispatcher.service', '', d)}" |
| 134 | 136 | ||
| 135 | ALTERNATIVE_PRIORITY = "100" | 137 | ALTERNATIVE_PRIORITY = "100" |
| @@ -138,6 +140,8 @@ ALTERNATIVE_TARGET[resolv-conf] = "${@bb.utils.contains('DISTRO_FEATURES','syste | |||
| 138 | ALTERNATIVE_LINK_NAME[resolv-conf] = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${sysconfdir}/resolv.conf','',d)}" | 140 | ALTERNATIVE_LINK_NAME[resolv-conf] = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${sysconfdir}/resolv.conf','',d)}" |
| 139 | 141 | ||
| 140 | do_install_append() { | 142 | do_install_append() { |
| 143 | install -Dm 0755 ${WORKDIR}/${BPN}.initd ${D}${sysconfdir}/init.d/network-manager | ||
| 144 | |||
| 141 | rm -rf ${D}/run ${D}${localstatedir}/run | 145 | rm -rf ${D}/run ${D}${localstatedir}/run |
| 142 | 146 | ||
| 143 | # For read-only filesystem, do not create links during bootup | 147 | # For read-only filesystem, do not create links during bootup |
