diff options
| author | Ross Burton <ross@openedhand.com> | 2008-08-04 13:45:06 +0000 |
|---|---|---|
| committer | Ross Burton <ross@openedhand.com> | 2008-08-04 13:45:06 +0000 |
| commit | 4f1efa2226096e30d06e6b3e3e3eff5b4c225d6a (patch) | |
| tree | a29fae482892fc1524c7f2f77ccc109e914b8374 | |
| parent | cf55538e50b59558da695c921d40b3d7921440ef (diff) | |
| download | openembedded-core-4f1efa2226096e30d06e6b3e3e3eff5b4c225d6a.tar.gz openembedded-core-4f1efa2226096e30d06e6b3e3e3eff5b4c225d6a.tar.bz2 openembedded-core-4f1efa2226096e30d06e6b3e3e3eff5b4c225d6a.zip | |
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
| -rw-r--r-- | meta/packages/initscripts/initscripts-1.0/functions | 4 | ||||
| -rw-r--r-- | 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 \ |