]> code.ossystems Code Review - openembedded-core.git/commitdiff
init-install.sh: Verify /sys based files exist before displaying them
authorDrew Moseley <drew_moseley@mentor.com>
Mon, 7 Jul 2014 00:43:00 +0000 (20:43 -0400)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 10 Jul 2014 16:37:38 +0000 (17:37 +0100)
Some mmc cards do not have all the data files in /sys/block
populated.  Check for existence before displaying the files
to avoid erroring out of the install process.

Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
meta/recipes-core/initrdscripts/files/init-install.sh

index 0a1141a6f5d35110b1d5618221171372817d4d6f..486c9f2635c5b4c93e8a6d9b8196b740d1bda064 100644 (file)
@@ -46,9 +46,14 @@ for hdname in $hdnamelist; do
        echo -n "VENDOR="
        cat /sys/block/$hdname/device/vendor
     fi
-    echo -n "MODEL="
-    cat /sys/block/$hdname/device/model
-    cat /sys/block/$hdname/device/uevent
+    if [ -r /sys/block/$hdname/device/model ]; then
+        echo -n "MODEL="
+        cat /sys/block/$hdname/device/model
+    fi
+    if [ -r /sys/block/$hdname/device/uevent ]; then
+        echo -n "UEVENT="
+        cat /sys/block/$hdname/device/uevent
+    fi
     echo
     # Get user choice
     while true; do