From 8568ba4e733bc690a60fc02372c2d5c3d626b5ee Mon Sep 17 00:00:00 2001
From: "Jordan K. Hubbard" <jkh@FreeBSD.org>
Date: Sat, 20 May 1995 11:13:58 +0000
Subject: [PATCH] Don't call mediaVerify() in quite so many places.

---
 release/sysinstall/dist.c     | 4 +---
 release/sysinstall/install.c  | 6 +++---
 release/sysinstall/media.c    | 5 +----
 usr.sbin/sade/install.c       | 6 +++---
 usr.sbin/sysinstall/dist.c    | 4 +---
 usr.sbin/sysinstall/install.c | 6 +++---
 usr.sbin/sysinstall/media.c   | 5 +----
 7 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/release/sysinstall/dist.c b/release/sysinstall/dist.c
index 40806c83cfb..0c044c87150 100644
--- a/release/sysinstall/dist.c
+++ b/release/sysinstall/dist.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: dist.c,v 1.10 1995/05/19 17:19:39 jkh Exp $
+ * $Id: dist.c,v 1.11 1995/05/20 00:13:08 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -248,7 +248,5 @@ distExtract(char *parent, Distribution *me)
 void
 distExtractAll(void)
 {
-    if (!mediaVerify())
-	return;
     distExtract(NULL, DistTable);
 }
diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c
index 1b880aafb31..22788b0f430 100644
--- a/release/sysinstall/install.c
+++ b/release/sysinstall/install.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: install.c,v 1.33 1995/05/20 08:31:40 jkh Exp $
+ * $Id: install.c,v 1.34 1995/05/20 10:33:03 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -72,8 +72,6 @@ preInstallCheck(void)
 	msgConfirm("You haven't told me what distributions to load yet!\nPlease select a distribution from the Distributions menu.");
 	return FALSE;
     }
-    if (!mediaVerify())
-	return FALSE;
     return TRUE;
 }
 
@@ -153,6 +151,8 @@ int
 installCommit(char *str)
 {
     installInitial();
+    if (!mediaVerify())
+	return 0;
     distExtractAll();
     installFinal();
     return 0;
diff --git a/release/sysinstall/media.c b/release/sysinstall/media.c
index 237d9301974..cc99cf946eb 100644
--- a/release/sysinstall/media.c
+++ b/release/sysinstall/media.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $Id: media.c,v 1.9 1995/05/20 10:33:06 jkh Exp $
+ * $Id: media.c,v 1.10 1995/05/20 11:10:33 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -218,9 +218,6 @@ mediaOpen(char *parent, char *me)
 {
     char fname[FILENAME_MAX];
 
-    if (!mediaVerify())
-	return NULL;
-
     if (parent)
 	snprintf(fname, FILENAME_MAX, "%s%s", parent, me);
     else
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c
index 1b880aafb31..22788b0f430 100644
--- a/usr.sbin/sade/install.c
+++ b/usr.sbin/sade/install.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: install.c,v 1.33 1995/05/20 08:31:40 jkh Exp $
+ * $Id: install.c,v 1.34 1995/05/20 10:33:03 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -72,8 +72,6 @@ preInstallCheck(void)
 	msgConfirm("You haven't told me what distributions to load yet!\nPlease select a distribution from the Distributions menu.");
 	return FALSE;
     }
-    if (!mediaVerify())
-	return FALSE;
     return TRUE;
 }
 
@@ -153,6 +151,8 @@ int
 installCommit(char *str)
 {
     installInitial();
+    if (!mediaVerify())
+	return 0;
     distExtractAll();
     installFinal();
     return 0;
diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c
index 40806c83cfb..0c044c87150 100644
--- a/usr.sbin/sysinstall/dist.c
+++ b/usr.sbin/sysinstall/dist.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: dist.c,v 1.10 1995/05/19 17:19:39 jkh Exp $
+ * $Id: dist.c,v 1.11 1995/05/20 00:13:08 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -248,7 +248,5 @@ distExtract(char *parent, Distribution *me)
 void
 distExtractAll(void)
 {
-    if (!mediaVerify())
-	return;
     distExtract(NULL, DistTable);
 }
diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index 1b880aafb31..22788b0f430 100644
--- a/usr.sbin/sysinstall/install.c
+++ b/usr.sbin/sysinstall/install.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: install.c,v 1.33 1995/05/20 08:31:40 jkh Exp $
+ * $Id: install.c,v 1.34 1995/05/20 10:33:03 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -72,8 +72,6 @@ preInstallCheck(void)
 	msgConfirm("You haven't told me what distributions to load yet!\nPlease select a distribution from the Distributions menu.");
 	return FALSE;
     }
-    if (!mediaVerify())
-	return FALSE;
     return TRUE;
 }
 
@@ -153,6 +151,8 @@ int
 installCommit(char *str)
 {
     installInitial();
+    if (!mediaVerify())
+	return 0;
     distExtractAll();
     installFinal();
     return 0;
diff --git a/usr.sbin/sysinstall/media.c b/usr.sbin/sysinstall/media.c
index 237d9301974..cc99cf946eb 100644
--- a/usr.sbin/sysinstall/media.c
+++ b/usr.sbin/sysinstall/media.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $Id: media.c,v 1.9 1995/05/20 10:33:06 jkh Exp $
+ * $Id: media.c,v 1.10 1995/05/20 11:10:33 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -218,9 +218,6 @@ mediaOpen(char *parent, char *me)
 {
     char fname[FILENAME_MAX];
 
-    if (!mediaVerify())
-	return NULL;
-
     if (parent)
 	snprintf(fname, FILENAME_MAX, "%s%s", parent, me);
     else