* loader2/method.c: make validIsoImages check the buildstamp and report

  back if it found invalid entries.
* loader2/method.h: update prototype for validIsoImages
* loader2/hdinstall.c: call validIsoImages() with foundinvalid = 0
* loader2/nfsinstall.c: pass the address of foundinvalid to
  validIsoImages
* update anaconda.spec

1 files changed, 13 insertions, 5 deletions

diff --git a/loader2/method.c b/loader2/method.c
index ca31da481..27b71e324 100644
--- a/loader2/method.c
+++ b/loader2/method.c
@@ -145,7 +145,7 @@ int mountLoopback(char * fsystem, char * mntpoint, char * device) {
 }
 
 /* returns the *absolute* path (malloced) to the #1 iso image */
-char * validIsoImages(char * dirName) {
+char * validIsoImages(char * dirName, int *foundinvalid) {
     DIR * dir;
     struct dirent * ent;
     char isoImage[1024];
@@ -175,10 +175,18 @@ char * validIsoImages(char * dirName) {
         }
         
 	snprintf(path, sizeof(path), "/tmp/loopimage/%s/base/hdstg2.img", getProductPath());
-        if (!access(path, F_OK)) {
-            umountLoopback("/tmp/loopimage", "loop7");
-            break;
-        }
+	if (mountLoopback(path, "/mnt/runtime", "loop0")) {
+	    umountLoopback("/mnt/runtime", "loop0");
+	} else {
+	    if (verifyStamp("/mnt/runtime")) {
+		umountLoopback("/tmp/runtime", "loop0");
+		umountLoopback("/tmp/loopimage", "loop7");
+		break;
+	    }
+	    logMessage("disc %s is not the right image", isoImage);
+	    umountLoopback("/mnt/runtime", "loop0");
+	    if (foundinvalid) *foundinvalid = 1;
+	}
         
         umountLoopback("/tmp/loopimage", "loop7");