Skip to content

Commit 28153db

Browse files
committed
rpi-eeprom-update: avoid any possible od accidents
This command pipeline: printf '00000000000000000000000000000000' | od -An -t x1 | tr -d ' ' produces this output: 30303030303030303030303030303030 * Add a `-v` to od and a `\n` to the tr arg like so: printf '00000000000000000000000000000000' | od -v -An -t x1 | tr -d ' \n' to instead produce this output: 3030303030303030303030303030303030303030303030303030303030303030 Although it's unlikely that the revision value would generate multiple lines or contain duplicate lines, it's better to be safe than sorry especially since the changes to do so do not introduce any extra overhead and use only POSIX-specified options/arguments. It's also possible this code fragment could be copied and pasted elsewhere to provide a "hexdump" of something that might be expected to generate multiple lines and which may potentially contain duplicates. By fixing the code here any breakage caused by such copying and pasting is avoided. Signed-off-by: Kyle J. McKay <[email protected]>
1 parent e9445df commit 28153db

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

rpi-eeprom-update

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ getBootloaderUpdateVersion() {
268268
}
269269

270270
checkDependencies() {
271-
BOARD_INFO="$(od -An -t x1 /sys/firmware/devicetree/base/system/linux,revision | tr -d ' ')"
271+
BOARD_INFO="$(od -v -An -t x1 /sys/firmware/devicetree/base/system/linux,revision | tr -d ' \n')"
272272
if [ $(((0x$BOARD_INFO >> 23) & 1)) -ne 0 ] && [ $(((0x$BOARD_INFO >> 12) & 15)) -eq 3 ]; then
273273
echo "BCM2711 detected"
274274
else

0 commit comments

Comments
 (0)