Selaa lähdekoodia

base-files: upgrade: Fix export_partdevice() quoting

$BOOTDEV_MAJOR may be empty for many of the uevents parsed in this
function. This condition thus tends to fail benignly (we just skip to
the next device), but it can really clutter the stage2 sysupgrade
stderr, since it looks like the "=" operand doesn't have an appropriate
left-hand argument.

Signed-off-by: Brian Norris <[email protected]>
Brian Norris 2 vuotta sitten
vanhempi
sitoutus
3cd882744d
1 muutettua tiedostoa jossa 1 lisäystä ja 1 poistoa
  1. 1 1
      package/base-files/files/lib/upgrade/common.sh

+ 1 - 1
package/base-files/files/lib/upgrade/common.sh

@@ -232,7 +232,7 @@ export_partdevice() {
 		while read line; do
 			export -n "$line"
 		done < "$uevent"
-		if [ $BOOTDEV_MAJOR = $MAJOR -a $(($BOOTDEV_MINOR + $offset)) = $MINOR -a -b "/dev/$DEVNAME" ]; then
+		if [ "$BOOTDEV_MAJOR" = "$MAJOR" -a $(($BOOTDEV_MINOR + $offset)) = "$MINOR" -a -b "/dev/$DEVNAME" ]; then
 			export "$var=$DEVNAME"
 			return 0
 		fi