d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change the way that X configuration method is selected.

Browse Source
This commit is contained in:
Jordan K. Hubbard 1997-06-21 15:45:15 +00:00
parent ce93f47a1e
commit 31377e1f1f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=26764
15 changed files with 54 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
release/sysinstall/config.c
View File

@ -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;

4
release/sysinstall/dispatch.c
View File

@ -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 },

12
release/sysinstall/install.c
View File

@ -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 @@ installCommit(dialogMenuItem *self)
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;
}

4
release/sysinstall/menus.c
View File

@ -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",

4
release/sysinstall/sysinstall.h
View File

@ -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);

4
usr.sbin/sade/config.c
View File

@ -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;

4
usr.sbin/sade/dispatch.c
View File

@ -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 },

12
usr.sbin/sade/install.c
View File

@ -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 @@ installCommit(dialogMenuItem *self)
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;
}

4
usr.sbin/sade/menus.c
View File

@ -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",

4
usr.sbin/sade/sade.h
View File

@ -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);

4
usr.sbin/sysinstall/config.c
View File

@ -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;

4
usr.sbin/sysinstall/dispatch.c
View File

@ -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 },

12
usr.sbin/sysinstall/install.c
View File

@ -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 @@ installCommit(dialogMenuItem *self)
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;
}

4
usr.sbin/sysinstall/menus.c
View File

@ -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",

4
usr.sbin/sysinstall/sysinstall.h
View File

@ -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);