Yes, I know, it's gratuitous redefinition of a field.
Look ok?
Bill
Index: loader2/method.c
===================================================================
RCS file: /usr/local/CVS/anaconda/loader2/method.c,v
retrieving revision 1.29
diff -u -r1.29 method.c
--- loader2/method.c 26 Apr 2005 19:37:55 -0000 1.29
+++ loader2/method.c 17 May 2005 20:24:13 -0000
@@ -541,15 +541,15 @@
int fail = 0;
char * p, *q;
- stamp1 = alloca(13);
- stamp2 = alloca(13);
+ stamp1 = alloca(80);
+ stamp2 = alloca(80);
/* grab the one from the initrd */
f = fopen("/.buildstamp", "r");
if (!f) {
fail = 1;
} else {
- q = fgets(stamp1, 13, f);
+ q = fgets(stamp1, 80, f);
fclose(f);
/* and the runtime */
@@ -559,10 +559,10 @@
if (!f) {
fail = 1;
} else {
- q = fgets(stamp2, 13, f);
+ q = fgets(stamp2, 80, f);
fclose(f);
- if (strncmp(stamp1, stamp2, 12) != 0) {
+ if (strcmp(stamp1, stamp2) != 0) {
fail = 1;
}
}
Index: scripts/mk-images
===================================================================
RCS file: /usr/local/CVS/anaconda/scripts/mk-images,v
retrieving revision 1.172
diff -u -r1.172 mk-images
--- scripts/mk-images 5 Apr 2005 18:28:03 -0000 1.172
+++ scripts/mk-images 17 May 2005 20:24:13 -0000
@@ -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>]"
