From: rjt@cambridgebroadband.com <rjt@cambridgebroadband.com>
Date: Thu, 17 Feb 2005 17:52:39 +0000 (+0000)
Subject: Merge oe-devel@oe-devel.bkbits.net:openembedded
X-Git-Tag: Release-2010-05/1~14954
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79a4c8d5f9866026f252be54332a7f7577380525;p=openembedded.git

Merge oe-devel@oe-devel.bkbits.net:openembedded
into flotta.cambridgebroadband.com:/development/openembedded/openembedded

2005/02/17 17:29:44+00:00 cambridgebroadband.com!rjt
make checkversion run before anything else

BKrev: 4214d9e7dYpvaTQFH5y1qoqm2xd37w
---

diff --git a/packages/initscripts/initscripts-1.0/openzaurus/checkversion b/packages/initscripts/initscripts-1.0/openzaurus/checkversion
index 6a871091e9..6c52816ec8 100644
--- a/packages/initscripts/initscripts-1.0/openzaurus/checkversion
+++ b/packages/initscripts/initscripts-1.0/openzaurus/checkversion
@@ -2,7 +2,6 @@
 found=`cat /proc/version | cut -d ' ' -f3`
 
 if [ "VERSION" != "$found" ] ; then
-	chvt 1
 	echo -e >/dev/tty1
 	echo -e "\033[31;1m ******************************************* \033[0m" >/dev/tty1
 	echo -e "\033[31;1m *            \033[0mW A R N I N G !              \033[31;1m* \033[0m" >/dev/tty1
@@ -27,5 +26,4 @@ if [ "VERSION" != "$found" ] ; then
         echo -e "\033[31;1m ******************************************* \033[0m" >/dev/tty1
         echo >/dev/tty1
 	sleep 60
-	chvt 2
 fi
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index 4e7d5df89c..22fb2c08fa 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "makedevs"
 DEPENDS_openzaurus = "makedevs virtual/kernel"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r34"
+PR = "r35"
 
 SRC_URI = "file://halt \
            file://ramdisk \
@@ -88,7 +88,7 @@ do_install () {
 	if [ "${DISTRO}" == "openzaurus" ]; then
 		cat ${WORKDIR}/checkversion | sed -e "s,VERSION,${KERNEL_VERSION}-${DISTRO_VERSION}," > ${D}/etc/init.d/checkversion
         	chmod 0755 				${D}/etc/init.d/checkversion
-		ln -sf          ../init.d/checkversion  ${D}/etc/rcS.d/S05version
+		ln -sf          ../init.d/checkversion  ${D}/etc/rcS.d/S00version
 	fi
 
 	if [ "${MACHINE}" == "c7x0" ]; then