diff --git a/gnomeos/yocto/recipies-core/initscripts/initscripts-1.0/NetworkManager b/gnomeos/yocto/recipies-core/initscripts/initscripts-1.0/NetworkManager new file mode 100644 index 00000000..ee253bef --- /dev/null +++ b/gnomeos/yocto/recipies-core/initscripts/initscripts-1.0/NetworkManager @@ -0,0 +1,31 @@ +#!/bin/sh + +start() +{ + echo -n $"Starting NetworkManager daemon: " + /usr/sbin/NetworkManager --pid-file=/var/run/NetworkManager.pid & +} + +stop() +{ + echo -n $"Stopping NetworkManager daemon: " + kill -TERM `cat /var/run/NetworkManager.pid` +} + +# See how we were called. +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart) + stop + start + ;; + *) + echo $"Usage: $0 {start|stop|status|restart|condrestart}" + ;; +esac +exit $RETVAL diff --git a/gnomeos/yocto/recipies-core/initscripts/initscripts-1.0/arm/alignment.sh b/gnomeos/yocto/recipies-core/initscripts/initscripts-1.0/arm/alignment.sh deleted file mode 100644 index b577b9a0..00000000 --- a/gnomeos/yocto/recipies-core/initscripts/initscripts-1.0/arm/alignment.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: alignment -# Required-Start: mountkernfs -# Required-Stop: mountkernfs -# Default-Start: S -# Default-Stop: -### END INIT INFO - -if [ -e /proc/cpu/alignment ]; then - echo "3" > /proc/cpu/alignment -fi - diff --git a/gnomeos/yocto/recipies-core/initscripts/initscripts-1.0/dbus b/gnomeos/yocto/recipies-core/initscripts/initscripts-1.0/dbus new file mode 100644 index 00000000..0b3a9dcd --- /dev/null +++ b/gnomeos/yocto/recipies-core/initscripts/initscripts-1.0/dbus @@ -0,0 +1,31 @@ +#!/bin/sh + +start() +{ + echo -n "Starting dbus daemon: " + /usr/bin/dbus-daemon --system +} + +stop() +{ + echo -n "Stopping dbus not implemented " + exit 1 +} + +# See how we were called. +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart) + stop + start + ;; + *) + echo $"Usage: $0 {start|stop|status|restart|condrestart}" + ;; +esac +exit $RETVAL diff --git a/gnomeos/yocto/recipies-core/initscripts/initscripts_1.0.bb b/gnomeos/yocto/recipies-core/initscripts/initscripts_1.0.bb index aa20e5f6..4bf77c05 100644 --- a/gnomeos/yocto/recipies-core/initscripts/initscripts_1.0.bb +++ b/gnomeos/yocto/recipies-core/initscripts/initscripts_1.0.bb @@ -16,6 +16,8 @@ SRC_URI = "file://functions \ file://finish.sh \ file://bootmisc.sh \ file://mountnfs.sh \ + file://NetworkManager \ + file://dbus \ file://reboot \ file://single \ file://sendsigs \ @@ -58,6 +60,8 @@ do_install () { install -m 0755 ${WORKDIR}/halt ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/hostname.sh ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/mountall.sh ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/NetworkManager ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/dbus ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/mountnfs.sh ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/reboot ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/rmnologin.sh ${D}${sysconfdir}/init.d @@ -66,9 +70,6 @@ do_install () { install -m 0755 ${WORKDIR}/umountnfs.sh ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/urandom ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/save-rtc.sh ${D}${sysconfdir}/init.d - if [ "${TARGET_ARCH}" = "arm" ]; then - install -m 0755 ${WORKDIR}/alignment.sh ${D}${sysconfdir}/init.d - fi # # Install device dependent scripts # @@ -98,14 +99,13 @@ do_install () { ln -sf ../init.d/banner.sh ${D}${sysconfdir}/rcS.d/S02banner.sh ln -sf ../init.d/mountall.sh ${D}${sysconfdir}/rcS.d/S35mountall.sh ln -sf ../init.d/hostname.sh ${D}${sysconfdir}/rcS.d/S39hostname.sh + ln -sf ../init.d/dbus ${D}${sysconfdir}/rcS.d/S40dbus + ln -sf ../init.d/NetworkManager ${D}${sysconfdir}/rcS.d/S41NetworkManager ln -sf ../init.d/mountnfs.sh ${D}${sysconfdir}/rcS.d/S45mountnfs.sh ln -sf ../init.d/bootmisc.sh ${D}${sysconfdir}/rcS.d/S55bootmisc.sh # ln -sf ../init.d/urandom ${D}${sysconfdir}/rcS.d/S55urandom # ln -sf ../init.d/finish.sh ${D}${sysconfdir}/rcS.d/S99finish.sh # udev will run at S03 if installed - if [ "${TARGET_ARCH}" = "arm" ]; then - ln -sf ../init.d/alignment.sh ${D}${sysconfdir}/rcS.d/S06alignment.sh - fi install -m 0755 ${WORKDIR}/device_table.txt ${D}${sysconfdir}/device_table }