diff --git a/gnomeos/yocto/recipies-core/initscripts/initscripts-1.0/bootmisc.sh b/gnomeos/yocto/recipies-core/initscripts/initscripts-1.0/bootmisc.sh deleted file mode 100755 index 03fd67c6..00000000 --- a/gnomeos/yocto/recipies-core/initscripts/initscripts-1.0/bootmisc.sh +++ /dev/null @@ -1,78 +0,0 @@ -### BEGIN INIT INFO -# Provides: bootmisc -# Required-Start: $local_fs mountvirtfs -# Required-Stop: $local_fs -# Default-Start: S -# Default-Stop: 0 6 -# Short-Description: Misc and other. -### END INIT INFO - -. /etc/default/rcS -# -# Put a nologin file in /etc to prevent people from logging in before -# system startup is complete. -# -if test "$DELAYLOGIN" = yes -then - echo "System bootup in progress - please wait" > /etc/nologin - cp /etc/nologin /etc/nologin.boot -fi - -# -# Set pseudo-terminal access permissions. -# -if test -c /dev/ttyp0 -then - chmod 666 /dev/tty[p-za-e][0-9a-f] - chown root:tty /dev/tty[p-za-e][0-9a-f] -fi - -# -# Apply /proc settings if defined -# -SYSCTL_CONF="/etc/sysctl.conf" -if [ -f "${SYSCTL_CONF}" ] -then - if [ -x "/sbin/sysctl" ] - then - /sbin/sysctl -p "${SYSCTL_CONF}" - else - echo "To have ${SYSCTL_CONF} applied during boot, install package ." - fi -fi - -# -# Update /etc/motd. -# -if test "$EDITMOTD" != no -then - uname -a > /etc/motd.tmp - sed 1d /etc/motd >> /etc/motd.tmp - mv /etc/motd.tmp /etc/motd -fi - -# -# This is as good a place as any for a sanity check -# /tmp should be a symlink to /var/tmp to cut down on the number -# of mounted ramdisks. -if test ! -L /tmp && test -d /var/tmp -then - rm -rf /tmp - ln -sf /var/tmp /tmp -fi - -# Set the system clock from hardware clock -# If the timestamp is 1 day or more recent than the current time, -# use the timestamp instead. -/etc/init.d/hwclock.sh start -if test -e /etc/timestamp -then - SYSTEMDATE=`date -u +%2m%2d%2H%2M%4Y` - read TIMESTAMP < /etc/timestamp - NEEDUPDATE=`expr \( $TIMESTAMP \> $SYSTEMDATE + 10000 \)` - if [ $NEEDUPDATE -eq 1 ]; then - date -u $TIMESTAMP - /etc/init.d/hwclock.sh stop - fi -fi -: exit 0 diff --git a/gnomeos/yocto/recipies-core/initscripts/initscripts-1.0/gnomemisc b/gnomeos/yocto/recipies-core/initscripts/initscripts-1.0/gnomemisc new file mode 100644 index 00000000..b47a7f5a --- /dev/null +++ b/gnomeos/yocto/recipies-core/initscripts/initscripts-1.0/gnomemisc @@ -0,0 +1,3 @@ +#!/bin/sh + +mkdir -p -m 1777 /tmp/.ICE-unix diff --git a/gnomeos/yocto/recipies-core/initscripts/initscripts_1.0.bb b/gnomeos/yocto/recipies-core/initscripts/initscripts_1.0.bb index 5b839682..ef85a14f 100644 --- a/gnomeos/yocto/recipies-core/initscripts/initscripts_1.0.bb +++ b/gnomeos/yocto/recipies-core/initscripts/initscripts_1.0.bb @@ -14,11 +14,11 @@ SRC_URI = "file://functions \ file://mountall.sh \ file://banner.sh \ file://finish.sh \ - file://bootmisc.sh \ file://mountnfs.sh \ file://NetworkManager \ file://dbus \ file://gnomeudev \ + file://gnomemisc \ file://reboot \ file://single \ file://sendsigs \ @@ -56,13 +56,13 @@ do_install () { install -d ${D}${sysconfdir}/default install -m 0644 ${WORKDIR}/functions ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/bootmisc.sh ${D}${sysconfdir}/init.d # install -m 0755 ${WORKDIR}/finish.sh ${D}${sysconfdir}/init.d 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}/gnomeudev ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/gnomemisc ${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 @@ -102,8 +102,8 @@ do_install () { ln -sf ../init.d/dbus ${D}${sysconfdir}/rcS.d/S40dbus ln -sf ../init.d/NetworkManager ${D}${sysconfdir}/rcS.d/S41NetworkManager ln -sf ../init.d/gnomeudev ${D}${sysconfdir}/rcS.d/S03gnomeudev + ln -sf ../init.d/gnomemisc ${D}${sysconfdir}/rcS.d/S04gnomemisc 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