From 4f1efa2226096e30d06e6b3e3e3eff5b4c225d6a Mon Sep 17 00:00:00 2001
From: Ross Burton <ross@openedhand.com>
Date: Mon, 4 Aug 2008 13:45:06 +0000
Subject: initscripts: merge OE change of cpuinfo_id to machine_id, fixing
 gsmd's startup

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5016 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/initscripts/initscripts-1.0/functions | 4 ++--
 meta/packages/initscripts/initscripts_1.0.bb        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/packages/initscripts/initscripts-1.0/functions b/meta/packages/initscripts/initscripts-1.0/functions
index 514618770a..689fd32b39 100644
--- a/meta/packages/initscripts/initscripts-1.0/functions
+++ b/meta/packages/initscripts/initscripts-1.0/functions
@@ -4,8 +4,8 @@
 #               shell scripts in the /etc/init.d directory.
 #
 
-cpuinfo_id() {		# return the Hardware module ID
-    awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo
+machine_id() {		# return the machine ID
+    awk 'BEGIN { FS=": " } /Hardware/ { gsub(" ", "_", $2); print tolower($2) } ' </proc/cpuinfo
 }
 
 killproc() {		# kill the named process(es)
diff --git a/meta/packages/initscripts/initscripts_1.0.bb b/meta/packages/initscripts/initscripts_1.0.bb
index d2fc3d5e52..377cc14102 100644
--- a/meta/packages/initscripts/initscripts_1.0.bb
+++ b/meta/packages/initscripts/initscripts_1.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
 DEPENDS = "makedevs"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r116"
+PR = "r117"
 
 SRC_URI = "file://functions \
            file://halt \
-- 
cgit v1.2.3