ipq40xx: Support Chromium OS image-type creation

[openwrt/staging/chunkeey.git] / package / base-files / files / lib / upgrade / common.sh

diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh
index 24ff77a8b3101e0ad1ee0f4b46ff626ecb1ce0f5..5af061f6a43990afea92f8eacd865fe5249d8300 100644 (file)
--- a/package/base-files/files/lib/upgrade/common.sh
+++ b/package/base-files/files/lib/upgrade/common.sh
@@ -155,9 +155,11 @@ export_bootdevice() {
                                fi
                        done
                ;;
+               PARTUUID=????????-????-????-????-??????????0?/PARTNROFF=1 | \
                PARTUUID=????????-????-????-????-??????????02)
                        uuid="${rootpart#PARTUUID=}"
-                       uuid="${uuid%02}00"
+                       uuid="${uuid%/PARTNROFF=1}"
+                       uuid="${uuid%0?}00"
                        for disk in $(find /dev -type b); do
                                set -- $(dd if=$disk bs=1 skip=568 count=16 2>/dev/null | hexdump -v -e '8/1 "%02x "" "2/1 "%02x""-"6/1 "%02x"')
                                if [ "$4$3$2$1-$6$5-$8$7-$9" = "$uuid" ]; then