From: Ben Gras <ben@minix3.org>
Date: Wed, 18 Jan 2006 12:37:45 +0000 (+0000)
Subject: Install image as e.g. 3.1.2 instead of 3.1.2r0 if there is no revision file.
X-Git-Tag: v3.1.2a~429
X-Git-Url: http://zhaoyanbai.com/repos/dnssec-dsfromkey.html?a=commitdiff_plain;h=c806c7ba7c9354dc0d401e3a9e566f74af5caca4;p=minix.git

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 15a9668a6..50235e529 100755
--- 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`