This commit is contained in:
jkh 1997-04-28 06:15:49 +00:00
parent 1cc559a091
commit 950e94d56a
6 changed files with 57 additions and 18 deletions

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.86 1997/03/12 02:31:28 jkh Exp $
* $Id: config.c,v 1.87 1997/04/20 16:46:25 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -503,10 +503,21 @@ configXFree86(dialogMenuItem *self)
else {
int i;
if (directory_exists("/dist/CDE") && !msgYesNo("Would you like to install the CDE desktop package now?")) {
dialog_clear_norefresh();
msgNotify("Running AcceleratedX 3.1 installation procedure, please wait.");
if ((i = vsystem("/usr/X11R6/lib/X11/AcceleratedX/bin/Xinstall"))) {
dialog_clear_norefresh();
msgConfirm("Installation procedure failed, error code %d! Please report\n"
"error to Walnut Creek CDROM tech support (either send email\n"
"to support@cdrom.com or call +1 510 603 1234). Thank you!", i);
return DITEM_FAILURE | DITEM_RESTORE;
}
if (directory_exists("/dist/CDE")) {
dialog_clear_norefresh();
msgNotify("Running CDE installation - please wait (this may take awhile!).");
dialog_clear();
clear();
refresh();
i = systemExecute("(cd /dist/CDE; sh Install)");
dialog_clear();
if (i) {
@ -516,10 +527,8 @@ configXFree86(dialogMenuItem *self)
"to it will actually be /cdrom/CDE/dtinstall when you run it later).\n");
}
}
dialog_clear_norefresh();
msgNotify("Running AcceleratedX 3.1 installation procedure, please wait.");
if ((i = vsystem("/usr/X11R6/lib/X11/AcceleratedX/bin/Xinstall"))) {
dialog_clear_norefresh();
msgConfirm("Installation procedure failed, error code %d! Please report\n"
"error to Walnut Creek CDROM tech support (either send email\n"
"to support@cdrom.com or call +1 510 603 1234). Thank you!", i);

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$
* $Id: system.c,v 1.77 1997/02/22 14:12:20 peter Exp $
*
* Jordan Hubbard
*
@ -20,6 +20,8 @@
#include <signal.h>
#include <sys/reboot.h>
#include <machine/console.h>
#include <sys/param.h>
#include <sys/mount.h>
#include <sys/fcntl.h>
#include <sys/ioctl.h>
#include <sys/wait.h>
@ -84,6 +86,8 @@ systemInitialize(int argc, char **argv)
setenv("PATH", "/stand:/bin:/sbin:/usr/sbin:/usr/bin:/mnt/bin:/mnt/sbin:/mnt/usr/sbin:/mnt/usr/bin:/usr/X11R6/bin", 1);
setbuf(stdin, 0);
setbuf(stderr, 0);
/* Remount root read/write in case it's R/O */
mount(MOUNT_MFS, "/", MNT_WANTRDWR | MNT_UPDATE, NULL);
}
else {
char hname[256];

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.86 1997/03/12 02:31:28 jkh Exp $
* $Id: config.c,v 1.87 1997/04/20 16:46:25 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -503,10 +503,21 @@ configXFree86(dialogMenuItem *self)
else {
int i;
if (directory_exists("/dist/CDE") && !msgYesNo("Would you like to install the CDE desktop package now?")) {
dialog_clear_norefresh();
msgNotify("Running AcceleratedX 3.1 installation procedure, please wait.");
if ((i = vsystem("/usr/X11R6/lib/X11/AcceleratedX/bin/Xinstall"))) {
dialog_clear_norefresh();
msgConfirm("Installation procedure failed, error code %d! Please report\n"
"error to Walnut Creek CDROM tech support (either send email\n"
"to support@cdrom.com or call +1 510 603 1234). Thank you!", i);
return DITEM_FAILURE | DITEM_RESTORE;
}
if (directory_exists("/dist/CDE")) {
dialog_clear_norefresh();
msgNotify("Running CDE installation - please wait (this may take awhile!).");
dialog_clear();
clear();
refresh();
i = systemExecute("(cd /dist/CDE; sh Install)");
dialog_clear();
if (i) {
@ -516,10 +527,8 @@ configXFree86(dialogMenuItem *self)
"to it will actually be /cdrom/CDE/dtinstall when you run it later).\n");
}
}
dialog_clear_norefresh();
msgNotify("Running AcceleratedX 3.1 installation procedure, please wait.");
if ((i = vsystem("/usr/X11R6/lib/X11/AcceleratedX/bin/Xinstall"))) {
dialog_clear_norefresh();
msgConfirm("Installation procedure failed, error code %d! Please report\n"
"error to Walnut Creek CDROM tech support (either send email\n"
"to support@cdrom.com or call +1 510 603 1234). Thank you!", i);

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$
* $Id: system.c,v 1.77 1997/02/22 14:12:20 peter Exp $
*
* Jordan Hubbard
*
@ -20,6 +20,8 @@
#include <signal.h>
#include <sys/reboot.h>
#include <machine/console.h>
#include <sys/param.h>
#include <sys/mount.h>
#include <sys/fcntl.h>
#include <sys/ioctl.h>
#include <sys/wait.h>
@ -84,6 +86,8 @@ systemInitialize(int argc, char **argv)
setenv("PATH", "/stand:/bin:/sbin:/usr/sbin:/usr/bin:/mnt/bin:/mnt/sbin:/mnt/usr/sbin:/mnt/usr/bin:/usr/X11R6/bin", 1);
setbuf(stdin, 0);
setbuf(stderr, 0);
/* Remount root read/write in case it's R/O */
mount(MOUNT_MFS, "/", MNT_WANTRDWR | MNT_UPDATE, NULL);
}
else {
char hname[256];

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.86 1997/03/12 02:31:28 jkh Exp $
* $Id: config.c,v 1.87 1997/04/20 16:46:25 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -503,10 +503,21 @@ configXFree86(dialogMenuItem *self)
else {
int i;
if (directory_exists("/dist/CDE") && !msgYesNo("Would you like to install the CDE desktop package now?")) {
dialog_clear_norefresh();
msgNotify("Running AcceleratedX 3.1 installation procedure, please wait.");
if ((i = vsystem("/usr/X11R6/lib/X11/AcceleratedX/bin/Xinstall"))) {
dialog_clear_norefresh();
msgConfirm("Installation procedure failed, error code %d! Please report\n"
"error to Walnut Creek CDROM tech support (either send email\n"
"to support@cdrom.com or call +1 510 603 1234). Thank you!", i);
return DITEM_FAILURE | DITEM_RESTORE;
}
if (directory_exists("/dist/CDE")) {
dialog_clear_norefresh();
msgNotify("Running CDE installation - please wait (this may take awhile!).");
dialog_clear();
clear();
refresh();
i = systemExecute("(cd /dist/CDE; sh Install)");
dialog_clear();
if (i) {
@ -516,10 +527,8 @@ configXFree86(dialogMenuItem *self)
"to it will actually be /cdrom/CDE/dtinstall when you run it later).\n");
}
}
dialog_clear_norefresh();
msgNotify("Running AcceleratedX 3.1 installation procedure, please wait.");
if ((i = vsystem("/usr/X11R6/lib/X11/AcceleratedX/bin/Xinstall"))) {
dialog_clear_norefresh();
msgConfirm("Installation procedure failed, error code %d! Please report\n"
"error to Walnut Creek CDROM tech support (either send email\n"
"to support@cdrom.com or call +1 510 603 1234). Thank you!", i);

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$
* $Id: system.c,v 1.77 1997/02/22 14:12:20 peter Exp $
*
* Jordan Hubbard
*
@ -20,6 +20,8 @@
#include <signal.h>
#include <sys/reboot.h>
#include <machine/console.h>
#include <sys/param.h>
#include <sys/mount.h>
#include <sys/fcntl.h>
#include <sys/ioctl.h>
#include <sys/wait.h>
@ -84,6 +86,8 @@ systemInitialize(int argc, char **argv)
setenv("PATH", "/stand:/bin:/sbin:/usr/sbin:/usr/bin:/mnt/bin:/mnt/sbin:/mnt/usr/sbin:/mnt/usr/bin:/usr/X11R6/bin", 1);
setbuf(stdin, 0);
setbuf(stderr, 0);
/* Remount root read/write in case it's R/O */
mount(MOUNT_MFS, "/", MNT_WANTRDWR | MNT_UPDATE, NULL);
}
else {
char hname[256];