diff options
| author | Mike Fulbright <msf@redhat.com> | 2003-02-11 21:10:22 +0000 |
|---|---|---|
| committer | Mike Fulbright <msf@redhat.com> | 2003-02-11 21:10:22 +0000 |
| commit | bd4cdbb461b628390b4e82a125198caca9d19bc8 (patch) | |
| tree | 72e9c6afa1d6e04d4e3dc57a31538184b87ce546 /loader2/nfsinstall.c | |
| parent | 043e0a84f6b1dac9cfceda1f956d77f3c445a42f (diff) | |
| download | anaconda-bd4cdbb461b628390b4e82a125198caca9d19bc8.tar.gz anaconda-bd4cdbb461b628390b4e82a125198caca9d19bc8.tar.xz anaconda-bd4cdbb461b628390b4e82a125198caca9d19bc8.zip | |
oops forgot this one - fixes the multiple mounts of /mnt/source if several NFS mount attemps failed (due to users giving a bad path)
Diffstat (limited to 'loader2/nfsinstall.c')
| -rw-r--r-- | loader2/nfsinstall.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/loader2/nfsinstall.c b/loader2/nfsinstall.c index 1598e362f..4a9bf3b9b 100644 --- a/loader2/nfsinstall.c +++ b/loader2/nfsinstall.c @@ -173,7 +173,6 @@ char * mountNfsImage(struct installMethod * method, rc = mountStage2("/mnt/source/RedHat/base/stage2.img"); logMessage("after mountStage2, rc is %d", rc); if (rc) { - umount("/mnt/source"); if (rc == -1) { foundinvalid = 1; logMessage("not the right one"); @@ -183,7 +182,8 @@ char * mountNfsImage(struct installMethod * method, url = "nfs://mnt/source/."; break; } - } + } + if ((path = validIsoImages("/mnt/source"))) { logMessage("Path to valid iso is %s", path); copyUpdatesImg("/mnt/source/updates.img"); @@ -206,6 +206,9 @@ char * mountNfsImage(struct installMethod * method, } } + /* if we fell through to here we did not find a valid NFS */ + /* source for installation. */ + umount("/mnt/source"); if (foundinvalid) buf = sdupprintf(_("The %s installation tree in that " "directory does not seem to match " @@ -215,6 +218,7 @@ char * mountNfsImage(struct installMethod * method, "contain a %s installation tree."), getProductName()); newtWinMessage(_("Error"), _("OK"), buf); + break; } else { newtWinMessage(_("Error"), _("OK"), |