15 files changed, 54 insertions, 30 deletions

diff --git a/release/sysinstall/config.c b/release/sysinstall/config.c
index 0a3ea5f9e24f8..a17246dc89081 100644
--- a/release/sysinstall/config.c
+++ b/release/sysinstall/config.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: config.c,v 1.99 1997/06/11 08:41:09 jkh Exp $
+ * $Id: config.c,v 1.100 1997/06/13 14:21:19 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -503,7 +503,7 @@ configUsers(dialogMenuItem *self)
 }
 
 int
-configXFree86(dialogMenuItem *self)
+configXEnvironment(dialogMenuItem *self)
 {
 #ifndef USE_XIG_ENVIRONMENT
     char *config, *execfile;
diff --git a/release/sysinstall/dispatch.c b/release/sysinstall/dispatch.c
index 0d295b56a442d..e72303a1daee4 100644
--- a/release/sysinstall/dispatch.c
+++ b/release/sysinstall/dispatch.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: dispatch.c,v 1.16 1997/06/13 09:34:10 jkh Exp $
+ * $Id: dispatch.c,v 1.17 1997/06/13 17:55:32 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -54,7 +54,7 @@ static struct _word {
     { "configRegister",		configRegister		},
     { "configRouter",		configRouter		},
     { "configUsers",		configUsers		},
-    { "configXFree86",		configXFree86		},
+    { "configXEnvironment",	configXEnvironment	},
     { "diskPartitionEditor",	diskPartitionEditor	},
     { "diskPartitionWrite",	diskPartitionWrite	},
     { "diskLabelEditor",	diskLabelEditor		},
diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c
index 38179996cbb99..4ea6a3a0fb62d 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.189 1997/06/18 05:11:36 jkh Exp $
+ * $Id: install.c,v 1.190 1997/06/20 07:04:16 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -570,11 +570,13 @@ installNovice(dialogMenuItem *self)
     configRC_conf("/etc/rc.conf");
     sync();
 
+#ifndef USE_XIG_ENVIRONMENT
     if (directory_exists("/usr/X11R6")) {
 	dialog_clear_norefresh();
 	if (!msgYesNo("Would you like to configure your X server at this time?"))
-	    configXFree86(self);
+	    configXEnvironment(self);
     }
+#endif
 
     dialog_clear_norefresh();
     if (!msgYesNo("The FreeBSD package collection is a collection of hundreds of ready-to-run\n"
@@ -699,6 +701,12 @@ try_media:
 	    i = installFixup(self);
     }
     variable_set2(SYSTEM_STATE, DITEM_STATUS(i) == DITEM_FAILURE ? "error-install" : "full-install");
+
+    /* We always try to install X with the XiG product */
+#ifdef USE_XIG_ENVIRONMENT
+    if (directory_exists("/usr/X11R6"))
+	configXEnvironment(self);
+#endif
     return i | DITEM_RESTORE;
 }
 
diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c
index 82032d8b0e714..c355bcf1f881b 100644
--- a/release/sysinstall/menus.c
+++ b/release/sysinstall/menus.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: menus.c,v 1.138 1997/06/13 14:06:10 jkh Exp $
+ * $Id: menus.c,v 1.139 1997/06/13 14:21:20 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -1110,7 +1110,7 @@ DMenu MenuConfigure = {
 #else
       { "X XFree86",	"Configure XFree86",
 #endif
-	NULL, configXFree86 },
+	NULL, configXEnvironment },
       { "D Distributions", "Install additional distribution sets",
 	NULL, distExtractAll },
       { "L Label",	"The disk Label editor",
diff --git a/release/sysinstall/sysinstall.h b/release/sysinstall/sysinstall.h
index 204ad3d659e7e..a7b26fb8ea28b 100644
--- a/release/sysinstall/sysinstall.h
+++ b/release/sysinstall/sysinstall.h
@@ -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: sysinstall.h,v 1.134 1997/06/13 17:55:32 jkh Exp $
+ * $Id: sysinstall.h,v 1.135 1997/06/18 05:11:37 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -424,7 +424,7 @@ extern int	configSaver(dialogMenuItem *self);
 extern int	configSaverTimeout(dialogMenuItem *self);
 extern int	configNTP(dialogMenuItem *self);
 extern int	configUsers(dialogMenuItem *self);
-extern int	configXFree86(dialogMenuItem *self);
+extern int	configXEnvironment(dialogMenuItem *self);
 extern int	configRouter(dialogMenuItem *self);
 extern int	configSamba(dialogMenuItem *self);
 extern int	configPCNFSD(dialogMenuItem *self);
diff --git a/usr.sbin/sade/config.c b/usr.sbin/sade/config.c
index 0a3ea5f9e24f8..a17246dc89081 100644
--- a/usr.sbin/sade/config.c
+++ b/usr.sbin/sade/config.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: config.c,v 1.99 1997/06/11 08:41:09 jkh Exp $
+ * $Id: config.c,v 1.100 1997/06/13 14:21:19 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -503,7 +503,7 @@ configUsers(dialogMenuItem *self)
 }
 
 int
-configXFree86(dialogMenuItem *self)
+configXEnvironment(dialogMenuItem *self)
 {
 #ifndef USE_XIG_ENVIRONMENT
     char *config, *execfile;
diff --git a/usr.sbin/sade/dispatch.c b/usr.sbin/sade/dispatch.c
index 0d295b56a442d..e72303a1daee4 100644
--- a/usr.sbin/sade/dispatch.c
+++ b/usr.sbin/sade/dispatch.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: dispatch.c,v 1.16 1997/06/13 09:34:10 jkh Exp $
+ * $Id: dispatch.c,v 1.17 1997/06/13 17:55:32 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -54,7 +54,7 @@ static struct _word {
     { "configRegister",		configRegister		},
     { "configRouter",		configRouter		},
     { "configUsers",		configUsers		},
-    { "configXFree86",		configXFree86		},
+    { "configXEnvironment",	configXEnvironment	},
     { "diskPartitionEditor",	diskPartitionEditor	},
     { "diskPartitionWrite",	diskPartitionWrite	},
     { "diskLabelEditor",	diskLabelEditor		},
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c
index 38179996cbb99..4ea6a3a0fb62d 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.189 1997/06/18 05:11:36 jkh Exp $
+ * $Id: install.c,v 1.190 1997/06/20 07:04:16 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -570,11 +570,13 @@ installNovice(dialogMenuItem *self)
     configRC_conf("/etc/rc.conf");
     sync();
 
+#ifndef USE_XIG_ENVIRONMENT
     if (directory_exists("/usr/X11R6")) {
 	dialog_clear_norefresh();
 	if (!msgYesNo("Would you like to configure your X server at this time?"))
-	    configXFree86(self);
+	    configXEnvironment(self);
     }
+#endif
 
     dialog_clear_norefresh();
     if (!msgYesNo("The FreeBSD package collection is a collection of hundreds of ready-to-run\n"
@@ -699,6 +701,12 @@ try_media:
 	    i = installFixup(self);
     }
     variable_set2(SYSTEM_STATE, DITEM_STATUS(i) == DITEM_FAILURE ? "error-install" : "full-install");
+
+    /* We always try to install X with the XiG product */
+#ifdef USE_XIG_ENVIRONMENT
+    if (directory_exists("/usr/X11R6"))
+	configXEnvironment(self);
+#endif
     return i | DITEM_RESTORE;
 }
 
diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c
index 82032d8b0e714..c355bcf1f881b 100644
--- a/usr.sbin/sade/menus.c
+++ b/usr.sbin/sade/menus.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: menus.c,v 1.138 1997/06/13 14:06:10 jkh Exp $
+ * $Id: menus.c,v 1.139 1997/06/13 14:21:20 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -1110,7 +1110,7 @@ DMenu MenuConfigure = {
 #else
       { "X XFree86",	"Configure XFree86",
 #endif
-	NULL, configXFree86 },
+	NULL, configXEnvironment },
       { "D Distributions", "Install additional distribution sets",
 	NULL, distExtractAll },
       { "L Label",	"The disk Label editor",
diff --git a/usr.sbin/sade/sade.h b/usr.sbin/sade/sade.h
index 204ad3d659e7e..a7b26fb8ea28b 100644
--- a/usr.sbin/sade/sade.h
+++ b/usr.sbin/sade/sade.h
@@ -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: sysinstall.h,v 1.134 1997/06/13 17:55:32 jkh Exp $
+ * $Id: sysinstall.h,v 1.135 1997/06/18 05:11:37 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -424,7 +424,7 @@ extern int	configSaver(dialogMenuItem *self);
 extern int	configSaverTimeout(dialogMenuItem *self);
 extern int	configNTP(dialogMenuItem *self);
 extern int	configUsers(dialogMenuItem *self);
-extern int	configXFree86(dialogMenuItem *self);
+extern int	configXEnvironment(dialogMenuItem *self);
 extern int	configRouter(dialogMenuItem *self);
 extern int	configSamba(dialogMenuItem *self);
 extern int	configPCNFSD(dialogMenuItem *self);
diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c
index 0a3ea5f9e24f8..a17246dc89081 100644
--- a/usr.sbin/sysinstall/config.c
+++ b/usr.sbin/sysinstall/config.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: config.c,v 1.99 1997/06/11 08:41:09 jkh Exp $
+ * $Id: config.c,v 1.100 1997/06/13 14:21:19 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -503,7 +503,7 @@ configUsers(dialogMenuItem *self)
 }
 
 int
-configXFree86(dialogMenuItem *self)
+configXEnvironment(dialogMenuItem *self)
 {
 #ifndef USE_XIG_ENVIRONMENT
     char *config, *execfile;
diff --git a/usr.sbin/sysinstall/dispatch.c b/usr.sbin/sysinstall/dispatch.c
index 0d295b56a442d..e72303a1daee4 100644
--- a/usr.sbin/sysinstall/dispatch.c
+++ b/usr.sbin/sysinstall/dispatch.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: dispatch.c,v 1.16 1997/06/13 09:34:10 jkh Exp $
+ * $Id: dispatch.c,v 1.17 1997/06/13 17:55:32 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -54,7 +54,7 @@ static struct _word {
     { "configRegister",		configRegister		},
     { "configRouter",		configRouter		},
     { "configUsers",		configUsers		},
-    { "configXFree86",		configXFree86		},
+    { "configXEnvironment",	configXEnvironment	},
     { "diskPartitionEditor",	diskPartitionEditor	},
     { "diskPartitionWrite",	diskPartitionWrite	},
     { "diskLabelEditor",	diskLabelEditor		},
diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index 38179996cbb99..4ea6a3a0fb62d 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.189 1997/06/18 05:11:36 jkh Exp $
+ * $Id: install.c,v 1.190 1997/06/20 07:04:16 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -570,11 +570,13 @@ installNovice(dialogMenuItem *self)
     configRC_conf("/etc/rc.conf");
     sync();
 
+#ifndef USE_XIG_ENVIRONMENT
     if (directory_exists("/usr/X11R6")) {
 	dialog_clear_norefresh();
 	if (!msgYesNo("Would you like to configure your X server at this time?"))
-	    configXFree86(self);
+	    configXEnvironment(self);
     }
+#endif
 
     dialog_clear_norefresh();
     if (!msgYesNo("The FreeBSD package collection is a collection of hundreds of ready-to-run\n"
@@ -699,6 +701,12 @@ try_media:
 	    i = installFixup(self);
     }
     variable_set2(SYSTEM_STATE, DITEM_STATUS(i) == DITEM_FAILURE ? "error-install" : "full-install");
+
+    /* We always try to install X with the XiG product */
+#ifdef USE_XIG_ENVIRONMENT
+    if (directory_exists("/usr/X11R6"))
+	configXEnvironment(self);
+#endif
     return i | DITEM_RESTORE;
 }
 
diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c
index 82032d8b0e714..c355bcf1f881b 100644
--- a/usr.sbin/sysinstall/menus.c
+++ b/usr.sbin/sysinstall/menus.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: menus.c,v 1.138 1997/06/13 14:06:10 jkh Exp $
+ * $Id: menus.c,v 1.139 1997/06/13 14:21:20 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -1110,7 +1110,7 @@ DMenu MenuConfigure = {
 #else
       { "X XFree86",	"Configure XFree86",
 #endif
-	NULL, configXFree86 },
+	NULL, configXEnvironment },
       { "D Distributions", "Install additional distribution sets",
 	NULL, distExtractAll },
       { "L Label",	"The disk Label editor",
diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h
index 204ad3d659e7e..a7b26fb8ea28b 100644
--- a/usr.sbin/sysinstall/sysinstall.h
+++ b/usr.sbin/sysinstall/sysinstall.h
@@ -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: sysinstall.h,v 1.134 1997/06/13 17:55:32 jkh Exp $
+ * $Id: sysinstall.h,v 1.135 1997/06/18 05:11:37 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -424,7 +424,7 @@ extern int	configSaver(dialogMenuItem *self);
 extern int	configSaverTimeout(dialogMenuItem *self);
 extern int	configNTP(dialogMenuItem *self);
 extern int	configUsers(dialogMenuItem *self);
-extern int	configXFree86(dialogMenuItem *self);
+extern int	configXEnvironment(dialogMenuItem *self);
 extern int	configRouter(dialogMenuItem *self);
 extern int	configSamba(dialogMenuItem *self);
 extern int	configPCNFSD(dialogMenuItem *self);