summaryrefslogtreecommitdiff
path: root/recipes/initscripts
diff options
context:
space:
mode:
Diffstat (limited to 'recipes/initscripts')
-rw-r--r--recipes/initscripts/files/functions6
-rw-r--r--recipes/initscripts/initscripts_1.0.bb2
2 files changed, 6 insertions, 2 deletions
diff --git a/recipes/initscripts/files/functions b/recipes/initscripts/files/functions
index fb9a914e4d..51c1f13261 100644
--- a/recipes/initscripts/files/functions
+++ b/recipes/initscripts/files/functions
@@ -5,7 +5,11 @@
#
machine_id() { # return the machine ID
- awk 'BEGIN { FS=": " } /Hardware/ { gsub(" ", "_", $2); print tolower($2) } ' </proc/cpuinfo
+ id=`awk 'BEGIN { FS=": " } /Hardware/ { gsub(" ", "_", $2); print tolower($2) } ' </proc/cpuinfo`
+ if [ -n "$id" ]; then
+ id=`awk 'BEGIN { FS=": " } /platform/ { gsub(" ", "_", $2); print tolower($2) } ' </proc/cpuinfo`
+ fi
+ echo -n "$id"
}
killproc() { # kill the named process(es)
diff --git a/recipes/initscripts/initscripts_1.0.bb b/recipes/initscripts/initscripts_1.0.bb
index 1b0a94c221..38fe85e650 100644
--- a/recipes/initscripts/initscripts_1.0.bb
+++ b/recipes/initscripts/initscripts_1.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
DEPENDS = "makedevs"
RDEPENDS_${PN} = "makedevs"
LICENSE = "GPL"
-PR = "r121"
+PR = "r122"
SRC_URI = "file://functions \
file://halt \