Install image as e.g. 3.1.2 instead of 3.1.2r0 if there is no revision file.

diff --git a/tools/mkboot b/tools/mkboot
index 15a9668a6926f6c87b7dce0e5f1a5818c9213583..50235e5296745e5a6c4fd983e831547293bea0c6 100755 (executable)
--- a/tools/mkboot
+++ b/tools/mkboot
@@ -67,10 +67,12 @@ hdboot)
        revision=`cat revision 2>/dev/null`
        oldrev=$revision
        target="${version}r${revision}"
+       rrevision=r$revision
 
        if [ -z "$revision" ]
        then
                revision=0
+               rrevision=""
        elif [ -f $rootdir/boot/image/$target ]
        then
                if [ $rootdir/boot/image/$target -newer image ]
@@ -81,7 +83,7 @@ hdboot)
                fi
                revision=`expr $revision + 1`
        fi
-       target="${version}r${revision}"
+       target="${version}${rrevision}"
 
        set -- `ls -t $rootdir/boot/image`