o Break fixups into binary fixups and XFree86 based fixups.

o Move fixups into extraction routine so all consumers don't have to duplicate
  the right behavior.
o Make some things more orthogonal (just for asthetics sake)
o Add option to go back and do it again if XF86Setup fails (possibly with
  a different setup - this one has always annoyed me).

1 files changed, 1 insertions, 23 deletions

diff --git a/usr.sbin/sysinstall/installUpgrade.c b/usr.sbin/sysinstall/installUpgrade.c
index 099d3f3..3cc4c27 100644
--- a/usr.sbin/sysinstall/installUpgrade.c
+++ b/usr.sbin/sysinstall/installUpgrade.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: installUpgrade.c,v 1.59 1998/08/28 01:03:41 jkh Exp $
+ * $Id: installUpgrade.c,v 1.60 1998/11/03 03:38:55 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -331,18 +331,6 @@ media:
 	}
     }
 
-    if (extractingBin) {
-	msgNotify("OK, now it's time to go pound on your root a little bit to create all the\n"
-		  "/dev entries and such that a new system expects to see.  I'll also perform a\n"
-		  "few \"fixup\" operations to repair the effects of splatting a bin distribution\n"
-		  "on top of an existing system..");
-	if (DITEM_STATUS(installFixup(self)) == DITEM_FAILURE) {
-	    msgConfirm("Hmmmmm.  The fixups don't seem to have been very happy.\n"
-		       "You may wish to examine the system a little more closely when\n"
-		       "it comes time to merge your /etc customizations back.");
-	}
-    }
-    
     msgNotify("First stage of upgrade completed successfully!\n\n"
 	       "Next comes stage 2, where we attempt to resurrect your /etc\n"
 	       "directory!");
@@ -484,16 +472,6 @@ installUpgradeNonInteractive(dialogMenuItem *self)
 	}
     }
 
-    msgNotify("OK, now it's time to go pound on your root a little bit to create all the\n"
-	      "/dev entries and such that a new system expects to see.  I'll also perform a\n"
-	      "few \"fixup\" operations to repair the effects of splatting a bin distribution\n"
-	      "on top of an existing system..");
-    if (DITEM_STATUS(installFixup(self)) == DITEM_FAILURE) {
-	msgNotify("Hmmmmm.  The fixups don't seem to have been very happy.\n"
-		  "You may wish to examine the system a little more closely when\n"
-		  "it comes time to merge your /etc customizations back.");
-    }
-    
     msgNotify("First stage of upgrade completed successfully.");
     if (vsystem("tar -cpBf - -C %s . | tar --unlink -xpBf - -C /etc", saved_etc)) {
 	msgNotify("Unable to resurrect your old /etc!");