diff options
| author |   Stanislav Brabec <utx@penguin.cz> | 2010-08-10 18:34:52 +0000 |
|---|---|---|
| committer | utx@penguin.cz <utx@penguin.cz> | 2010-08-10 18:34:52 +0000 |
| commit | cdf13c967f6d86325ca577c0faa44dd593d7463e (patch) | |
| tree | 0cbdb443d1a4f9e2c3464f1c69a59270d700ed21 /recipes/initscripts | |
| parent | b48cd835b4cf09ade37170eca3923317c37adc11 (diff) | |
| download | openembedded-cdf13c967f6d86325ca577c0faa44dd593d7463e.tar.gz | |
initscripts: Fixed empty machine_id returned on some devices.
Signed-off-by: Stanislav Brabec <utx@penguin.cz>
Diffstat (limited to 'recipes/initscripts')
| -rw-r--r-- | recipes/initscripts/files/functions | 2 | ||||
| -rw-r--r-- | recipes/initscripts/initscripts_1.0.bb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/recipes/initscripts/files/functions b/recipes/initscripts/files/functions index 51c1f13261..b9dca1f96b 100644 --- a/recipes/initscripts/files/functions +++ b/recipes/initscripts/files/functions @@ -6,7 +6,7 @@ machine_id() { # return the machine ID id=`awk 'BEGIN { FS=": " } /Hardware/ { gsub(" ", "_", $2); print tolower($2) } ' </proc/cpuinfo` - if [ -n "$id" ]; then + if [ -z "$id" ]; then id=`awk 'BEGIN { FS=": " } /platform/ { gsub(" ", "_", $2); print tolower($2) } ' </proc/cpuinfo` fi echo -n "$id" diff --git a/recipes/initscripts/initscripts_1.0.bb b/recipes/initscripts/initscripts_1.0.bb index 38fe85e650..8c38d7fc9b 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 = "r122" +PR = "r123" SRC_URI = "file://functions \ file://halt \ @@ -35,7 +35,7 @@ SRC_URI = "file://functions \ SRC_URI_append_arm = " file://alignment.sh" -CONFFILES_${PN} += "${sysconfdir}/device_table" +CONFFILES_${PN} += "${sysconfdir}/device_table" KERNEL_VERSION = "" |