diff options
-rw-r--r-- | release/sysinstall/install.c | 4 | ||||
-rw-r--r-- | release/sysinstall/system.c | 4 | ||||
-rw-r--r-- | release/sysinstall/tcpip.c | 4 | ||||
-rw-r--r-- | usr.sbin/sade/install.c | 4 | ||||
-rw-r--r-- | usr.sbin/sade/system.c | 4 | ||||
-rw-r--r-- | usr.sbin/sysinstall/install.c | 4 | ||||
-rw-r--r-- | usr.sbin/sysinstall/system.c | 4 | ||||
-rw-r--r-- | usr.sbin/sysinstall/tcpip.c | 4 |
8 files changed, 19 insertions, 13 deletions
diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c index c47e3ed..f350c0c 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.52 1995/05/24 17:49:16 jkh Exp $ + * $Id: install.c,v 1.53 1995/05/25 01:22:15 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -414,6 +414,7 @@ cpio_extract(void) if (!floppyDev) continue; } + dialog_clear(); msgConfirm("Please Insert CPIO floppy in %s", floppyDev->description); CpioFD = open(floppyDev->devname, O_RDONLY); if (CpioFD >= 0) @@ -478,6 +479,7 @@ cpio_extract(void) msgConfirm("CPIO floppy did not extract properly! Please verify\nthat your media is correct and try again."); close(CpioFD); CpioFD = -1; + dialog_clear(); goto tryagain; } unlink("/OK"); diff --git a/release/sysinstall/system.c b/release/sysinstall/system.c index 022e0d9..f1d7ab3 100644 --- a/release/sysinstall/system.c +++ b/release/sysinstall/system.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: system.c,v 1.31 1995/05/24 23:36:50 jkh Exp $ + * $Id: system.c,v 1.32 1995/05/24 23:43:59 jkh Exp $ * * Jordan Hubbard * @@ -95,7 +95,7 @@ systemInitialize(int argc, char **argv) ioctl(0, TIOCSCTTY, (char *)NULL); dup2(0, 1); dup2(0, 2); - execlp("/stand/sh", "-sh", 0); + execlp("sh", "-sh", 0); exit(1); } diff --git a/release/sysinstall/tcpip.c b/release/sysinstall/tcpip.c index 69ecc08..0b96442 100644 --- a/release/sysinstall/tcpip.c +++ b/release/sysinstall/tcpip.c @@ -1,5 +1,5 @@ /* - * $Id: tcpip.c,v 1.11 1995/05/23 18:06:16 jkh Exp $ + * $Id: tcpip.c,v 1.12 1995/05/24 01:27:15 jkh Exp $ * * Copyright (c) 1995 * Gary J Palmer. All rights reserved. @@ -578,7 +578,7 @@ tcpStartPPP(void) fd = open("/dev/ttyv2", O_RDWR); if (fd == -1) return FALSE; - + Mkdir("/var/log", NULL); if (!fork()) { dup2(fd, 0); dup2(fd, 1); diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c index c47e3ed..f350c0c 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.52 1995/05/24 17:49:16 jkh Exp $ + * $Id: install.c,v 1.53 1995/05/25 01:22:15 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -414,6 +414,7 @@ cpio_extract(void) if (!floppyDev) continue; } + dialog_clear(); msgConfirm("Please Insert CPIO floppy in %s", floppyDev->description); CpioFD = open(floppyDev->devname, O_RDONLY); if (CpioFD >= 0) @@ -478,6 +479,7 @@ cpio_extract(void) msgConfirm("CPIO floppy did not extract properly! Please verify\nthat your media is correct and try again."); close(CpioFD); CpioFD = -1; + dialog_clear(); goto tryagain; } unlink("/OK"); diff --git a/usr.sbin/sade/system.c b/usr.sbin/sade/system.c index 022e0d9..f1d7ab3 100644 --- a/usr.sbin/sade/system.c +++ b/usr.sbin/sade/system.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: system.c,v 1.31 1995/05/24 23:36:50 jkh Exp $ + * $Id: system.c,v 1.32 1995/05/24 23:43:59 jkh Exp $ * * Jordan Hubbard * @@ -95,7 +95,7 @@ systemInitialize(int argc, char **argv) ioctl(0, TIOCSCTTY, (char *)NULL); dup2(0, 1); dup2(0, 2); - execlp("/stand/sh", "-sh", 0); + execlp("sh", "-sh", 0); exit(1); } diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c index c47e3ed..f350c0c 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.52 1995/05/24 17:49:16 jkh Exp $ + * $Id: install.c,v 1.53 1995/05/25 01:22:15 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -414,6 +414,7 @@ cpio_extract(void) if (!floppyDev) continue; } + dialog_clear(); msgConfirm("Please Insert CPIO floppy in %s", floppyDev->description); CpioFD = open(floppyDev->devname, O_RDONLY); if (CpioFD >= 0) @@ -478,6 +479,7 @@ cpio_extract(void) msgConfirm("CPIO floppy did not extract properly! Please verify\nthat your media is correct and try again."); close(CpioFD); CpioFD = -1; + dialog_clear(); goto tryagain; } unlink("/OK"); diff --git a/usr.sbin/sysinstall/system.c b/usr.sbin/sysinstall/system.c index 022e0d9..f1d7ab3 100644 --- a/usr.sbin/sysinstall/system.c +++ b/usr.sbin/sysinstall/system.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: system.c,v 1.31 1995/05/24 23:36:50 jkh Exp $ + * $Id: system.c,v 1.32 1995/05/24 23:43:59 jkh Exp $ * * Jordan Hubbard * @@ -95,7 +95,7 @@ systemInitialize(int argc, char **argv) ioctl(0, TIOCSCTTY, (char *)NULL); dup2(0, 1); dup2(0, 2); - execlp("/stand/sh", "-sh", 0); + execlp("sh", "-sh", 0); exit(1); } diff --git a/usr.sbin/sysinstall/tcpip.c b/usr.sbin/sysinstall/tcpip.c index 69ecc08..0b96442 100644 --- a/usr.sbin/sysinstall/tcpip.c +++ b/usr.sbin/sysinstall/tcpip.c @@ -1,5 +1,5 @@ /* - * $Id: tcpip.c,v 1.11 1995/05/23 18:06:16 jkh Exp $ + * $Id: tcpip.c,v 1.12 1995/05/24 01:27:15 jkh Exp $ * * Copyright (c) 1995 * Gary J Palmer. All rights reserved. @@ -578,7 +578,7 @@ tcpStartPPP(void) fd = open("/dev/ttyv2", O_RDWR); if (fd == -1) return FALSE; - + Mkdir("/var/log", NULL); if (!fork()) { dup2(fd, 0); dup2(fd, 1); |