Add arch to buildstamp and check it. (#151927)

3 files changed, 12 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index e6b0422ef..d8c605526 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-17  Bill Nottingham  <notting@redhat.com>
+
+	* scripts/mk-images: Add arch to buildstamp...
+	
+	* loader2/method.c: ... and check it. (#151927)
+
 2005-05-17  Jeremy Katz  <katzj@redhat.com>
 
 	* anaconda.spec: Bump version.
diff --git a/loader2/method.c b/loader2/method.c
index d06458dff..9cf8bb8bb 100644
--- a/loader2/method.c
+++ b/loader2/method.c
@@ -541,15 +541,15 @@ int verifyStamp(char * path) {
     int fail = 0;
     char * p, *q;
 
-    stamp1 = alloca(13);
-    stamp2 = alloca(13);
+    stamp1 = alloca(32);
+    stamp2 = alloca(32);
 
     /* grab the one from the initrd */
     f = fopen("/.buildstamp", "r");
     if (!f) {
         fail = 1;
     } else {
-        q = fgets(stamp1, 13, f);
+        q = fgets(stamp1, 32, f);
 	fclose(f);
 
         /* and the runtime */
@@ -559,10 +559,10 @@ int verifyStamp(char * path) {
         if (!f) {
             fail = 1;
         } else {
-            q = fgets(stamp2, 13, f);
+            q = fgets(stamp2, 32, f);
 	    fclose(f);
 
-            if (strncmp(stamp1, stamp2, 12) != 0) {
+            if (strcmp(stamp1, stamp2) != 0) {
                 fail = 1;
             }
         }
diff --git a/scripts/mk-images b/scripts/mk-images
index 6df162363..06c9a5bf3 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -2,7 +2,7 @@
 LANG=C
 
 PATH=$PATH:/sbin:/usr/sbin
-IMAGEUUID=$(date +%Y%m%d%H%M)
+IMAGEUUID=$(date +%Y%m%d%H%M).$(uname -i)
 
 usage () {
 	echo "usage: mk-images <pkgsrc> <toplevel> <template> <imgdir> <buildarch> <productname> <version> [<productpath>]"