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

Totally re-work cpio_extract.

Browse Source 
Erase the annoying "Command output is on debugging screen" message
when it's time to switch back.
This commit is contained in:
jkh 1995-05-20 08:31:43 +00:00
parent 380f7a7d56
commit 6d4fc9ec50
9 changed files with 264 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
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.31 1995/05/19 21:30:33 jkh Exp $
* $Id: install.c,v 1.32 1995/05/20 00:13:10 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -130,6 +130,21 @@ installInitial(void)
}
}
}
make_filesystems();
copy_self();
cpio_extract();
alreadyDone = TRUE;
}
static void
installFinal(void)
{
static Boolean alreadyDone = FALSE;
if (alreadyDone)
return;
install_configuration_files();
do_final_setup();
alreadyDone = TRUE;
}
@ -137,13 +152,9 @@ int
installCommit(char *str)
{
installInitial();
make_filesystems();
copy_self();
cpio_extract();
distExtractAll();
install_configuration_files();
do_final_setup();
return 1;
installFinal();
return 0;
}
/* Go newfs and/or mount all the filesystems we've been asked to */
@ -263,50 +274,65 @@ cpio_extract(void)
int i, j, zpid, cpid, pfd[2];
extern int wait(int *status);
while (CpioFD == -1) {
msgConfirm("Please Insert CPIO floppy in floppy drive 0");
CpioFD = open("/dev/rfd0", O_RDONLY);
}
msgNotify("Extracting contents of CPIO floppy...");
pipe(pfd);
zpid = fork();
if (!zpid) {
close(0); dup(CpioFD); close(CpioFD);
close(1); dup(pfd[1]); close(pfd[1]);
close(pfd[0]);
i = execl("/stand/gunzip", "/stand/gunzip", 0);
msgDebug("/stand/gunzip command returns %d status\n", i);
exit(i);
}
cpid = fork();
if (!cpid) {
close(0); dup(pfd[0]); close(pfd[0]);
close(CpioFD);
close(pfd[1]);
if (DebugFD != -1) {
dup2(DebugFD, 1);
dup2(DebugFD, 2);
tryagain:
j = fork();
if (!j) {
while (CpioFD == -1) {
msgConfirm("Please Insert CPIO floppy in floppy drive 0");
CpioFD = open("/dev/rfd0", O_RDONLY);
}
else {
chroot("/mnt"); chdir("/");
msgNotify("Extracting contents of CPIO floppy...");
pipe(pfd);
zpid = fork();
if (!zpid) {
dup2(CpioFD, 0); close(CpioFD);
dup2(pfd[1], 1); close(pfd[1]);
close(pfd[0]);
i = execl("/stand/gunzip", "/stand/gunzip", 0);
msgDebug("/stand/gunzip command returns %d status\n", i);
exit(i);
}
cpid = fork();
if (!cpid) {
dup2(pfd[0], 0); close(pfd[0]);
close(CpioFD);
close(pfd[1]);
if (DebugFD != -1) {
dup2(DebugFD, 1);
dup2(DebugFD, 2);
}
else {
close(1); open("/dev/null", O_WRONLY);
dup2(1, 2);
}
i = execl("/stand/cpio", "/stand/cpio", "-iduvm", 0);
msgDebug("/stand/cpio command returns %d status\n", i);
exit(i);
}
chdir("/mnt");
i = execl("/stand/cpio", "/stand/cpio", "-iduvm", 0);
msgDebug("/stand/cpio command returns %d status\n", i);
exit(i);
close(pfd[0]);
close(pfd[1]);
close(CpioFD);
i = waitpid(zpid, &j, 0);
if (i < 0 || j) {
msgConfirm("gunzip returned status of %d, error was: %s (%d)! Help!", j, strerror(errno), errno);
exit(1);
}
i = waitpid(cpid, &j);
if (i < 0 || j) {
msgConfirm("cpio returned status of %d, error was: %s (%d)! Help!", j, strerror(errno), errno);
exit(2);
}
exit(0);
}
close(pfd[0]);
close(pfd[1]);
close(CpioFD);
i = wait(&j);
if (i < 0 || j)
msgFatal("Pid %d, status %d, cpio=%d, gunzip=%d.\nerror:%s",
i, j, cpid, zpid, strerror(errno));
i = wait(&j);
if (i < 0 || j)
msgFatal("Pid %d, status %d, cpio=%d, gunzip=%d.\nerror:%s",
i, j, cpid, zpid, strerror(errno));
else
i = wait(&j);
if (i < 0 || j || access("/mnt/OK", R_OK) == -1) {
msgConfirm("CPIO floppy did not extract properly! Please verify\n\that your media is correct and try again");
goto tryagain;
}
unlink("/mnt/OK");
}
static void

18
release/sysinstall/msg.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: msg.c,v 1.15 1995/05/19 21:30:34 jkh Exp $
* $Id: msg.c,v 1.16 1995/05/20 07:50:20 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -81,8 +81,10 @@ msgInfo(char *fmt, ...)
mvaddstr(23, 0, errstr);
attrset(attrs);
refresh();
if (OnVTY)
if (OnVTY) {
msgDebug("Informational message `%s'\n", errstr);
msgInfo("");
}
free(errstr);
}
@ -179,8 +181,10 @@ msgConfirm(char *fmt, ...)
va_end(args);
use_helpline(NULL);
use_helpfile(NULL);
if (OnVTY)
if (OnVTY) {
msgDebug("User confirmation requested (type ALT-F1)\n");
msgInfo("");
}
dialog_notify(errstr);
free(errstr);
}
@ -219,8 +223,10 @@ msgYesNo(char *fmt, ...)
use_helpline(NULL);
use_helpfile(NULL);
w = dupwin(newscr);
if (OnVTY)
if (OnVTY) {
msgDebug("User decision requested (type ALT-F1)\n");
msgInfo("");
}
ret = dialog_yesno("User Confirmation Requested", errstr, -1, -1);
touchwin(w);
wrefresh(w);
@ -250,8 +256,10 @@ msgGetInput(char *buf, char *fmt, ...)
else
input_buffer[0] = '\0';
w = dupwin(newscr);
if (OnVTY)
if (OnVTY) {
msgDebug("User input requested (type ALT-F1)\n");
msgInfo("");
}
rval = dialog_inputbox("Value Required", errstr, -1, -1, input_buffer);
touchwin(w);
wrefresh(w);

5
release/sysinstall/system.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: system.c,v 1.19 1995/05/19 16:58:58 jkh Exp $
* $Id: system.c,v 1.20 1995/05/19 21:30:35 jkh Exp $
*
* Jordan Hubbard
*
@ -304,7 +304,8 @@ vsystem(char *fmt, ...)
case 0: /* child */
(void)sigsetmask(omask);
if (DebugFD != -1) {
msgInfo("Command output is on debugging screen - type ALT-F2 to see it");
if (OnVTY)
msgInfo("Command output is on debugging screen - type ALT-F2 to see it");
dup2(DebugFD, 0);
dup2(DebugFD, 1);
dup2(DebugFD, 2);

118
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.31 1995/05/19 21:30:33 jkh Exp $
* $Id: install.c,v 1.32 1995/05/20 00:13:10 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -130,6 +130,21 @@ installInitial(void)
}
}
}
make_filesystems();
copy_self();
cpio_extract();
alreadyDone = TRUE;
}
static void
installFinal(void)
{
static Boolean alreadyDone = FALSE;
if (alreadyDone)
return;
install_configuration_files();
do_final_setup();
alreadyDone = TRUE;
}
@ -137,13 +152,9 @@ int
installCommit(char *str)
{
installInitial();
make_filesystems();
copy_self();
cpio_extract();
distExtractAll();
install_configuration_files();
do_final_setup();
return 1;
installFinal();
return 0;
}
/* Go newfs and/or mount all the filesystems we've been asked to */
@ -263,50 +274,65 @@ cpio_extract(void)
int i, j, zpid, cpid, pfd[2];
extern int wait(int *status);
while (CpioFD == -1) {
msgConfirm("Please Insert CPIO floppy in floppy drive 0");
CpioFD = open("/dev/rfd0", O_RDONLY);
}
msgNotify("Extracting contents of CPIO floppy...");
pipe(pfd);
zpid = fork();
if (!zpid) {
close(0); dup(CpioFD); close(CpioFD);
close(1); dup(pfd[1]); close(pfd[1]);
close(pfd[0]);
i = execl("/stand/gunzip", "/stand/gunzip", 0);
msgDebug("/stand/gunzip command returns %d status\n", i);
exit(i);
}
cpid = fork();
if (!cpid) {
close(0); dup(pfd[0]); close(pfd[0]);
close(CpioFD);
close(pfd[1]);
if (DebugFD != -1) {
dup2(DebugFD, 1);
dup2(DebugFD, 2);
tryagain:
j = fork();
if (!j) {
while (CpioFD == -1) {
msgConfirm("Please Insert CPIO floppy in floppy drive 0");
CpioFD = open("/dev/rfd0", O_RDONLY);
}
else {
chroot("/mnt"); chdir("/");
msgNotify("Extracting contents of CPIO floppy...");
pipe(pfd);
zpid = fork();
if (!zpid) {
dup2(CpioFD, 0); close(CpioFD);
dup2(pfd[1], 1); close(pfd[1]);
close(pfd[0]);
i = execl("/stand/gunzip", "/stand/gunzip", 0);
msgDebug("/stand/gunzip command returns %d status\n", i);
exit(i);
}
cpid = fork();
if (!cpid) {
dup2(pfd[0], 0); close(pfd[0]);
close(CpioFD);
close(pfd[1]);
if (DebugFD != -1) {
dup2(DebugFD, 1);
dup2(DebugFD, 2);
}
else {
close(1); open("/dev/null", O_WRONLY);
dup2(1, 2);
}
i = execl("/stand/cpio", "/stand/cpio", "-iduvm", 0);
msgDebug("/stand/cpio command returns %d status\n", i);
exit(i);
}
chdir("/mnt");
i = execl("/stand/cpio", "/stand/cpio", "-iduvm", 0);
msgDebug("/stand/cpio command returns %d status\n", i);
exit(i);
close(pfd[0]);
close(pfd[1]);
close(CpioFD);
i = waitpid(zpid, &j, 0);
if (i < 0 || j) {
msgConfirm("gunzip returned status of %d, error was: %s (%d)! Help!", j, strerror(errno), errno);
exit(1);
}
i = waitpid(cpid, &j);
if (i < 0 || j) {
msgConfirm("cpio returned status of %d, error was: %s (%d)! Help!", j, strerror(errno), errno);
exit(2);
}
exit(0);
}
close(pfd[0]);
close(pfd[1]);
close(CpioFD);
i = wait(&j);
if (i < 0 || j)
msgFatal("Pid %d, status %d, cpio=%d, gunzip=%d.\nerror:%s",
i, j, cpid, zpid, strerror(errno));
i = wait(&j);
if (i < 0 || j)
msgFatal("Pid %d, status %d, cpio=%d, gunzip=%d.\nerror:%s",
i, j, cpid, zpid, strerror(errno));
else
i = wait(&j);
if (i < 0 || j || access("/mnt/OK", R_OK) == -1) {
msgConfirm("CPIO floppy did not extract properly! Please verify\n\that your media is correct and try again");
goto tryagain;
}
unlink("/mnt/OK");
}
static void

18
usr.sbin/sade/msg.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: msg.c,v 1.15 1995/05/19 21:30:34 jkh Exp $
* $Id: msg.c,v 1.16 1995/05/20 07:50:20 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -81,8 +81,10 @@ msgInfo(char *fmt, ...)
mvaddstr(23, 0, errstr);
attrset(attrs);
refresh();
if (OnVTY)
if (OnVTY) {
msgDebug("Informational message `%s'\n", errstr);
msgInfo("");
}
free(errstr);
}
@ -179,8 +181,10 @@ msgConfirm(char *fmt, ...)
va_end(args);
use_helpline(NULL);
use_helpfile(NULL);
if (OnVTY)
if (OnVTY) {
msgDebug("User confirmation requested (type ALT-F1)\n");
msgInfo("");
}
dialog_notify(errstr);
free(errstr);
}
@ -219,8 +223,10 @@ msgYesNo(char *fmt, ...)
use_helpline(NULL);
use_helpfile(NULL);
w = dupwin(newscr);
if (OnVTY)
if (OnVTY) {
msgDebug("User decision requested (type ALT-F1)\n");
msgInfo("");
}
ret = dialog_yesno("User Confirmation Requested", errstr, -1, -1);
touchwin(w);
wrefresh(w);
@ -250,8 +256,10 @@ msgGetInput(char *buf, char *fmt, ...)
else
input_buffer[0] = '\0';
w = dupwin(newscr);
if (OnVTY)
if (OnVTY) {
msgDebug("User input requested (type ALT-F1)\n");
msgInfo("");
}
rval = dialog_inputbox("Value Required", errstr, -1, -1, input_buffer);
touchwin(w);
wrefresh(w);

5
usr.sbin/sade/system.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: system.c,v 1.19 1995/05/19 16:58:58 jkh Exp $
* $Id: system.c,v 1.20 1995/05/19 21:30:35 jkh Exp $
*
* Jordan Hubbard
*
@ -304,7 +304,8 @@ vsystem(char *fmt, ...)
case 0: /* child */
(void)sigsetmask(omask);
if (DebugFD != -1) {
msgInfo("Command output is on debugging screen - type ALT-F2 to see it");
if (OnVTY)
msgInfo("Command output is on debugging screen - type ALT-F2 to see it");
dup2(DebugFD, 0);
dup2(DebugFD, 1);
dup2(DebugFD, 2);

118
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.31 1995/05/19 21:30:33 jkh Exp $
* $Id: install.c,v 1.32 1995/05/20 00:13:10 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -130,6 +130,21 @@ installInitial(void)
}
}
}
make_filesystems();
copy_self();
cpio_extract();
alreadyDone = TRUE;
}
static void
installFinal(void)
{
static Boolean alreadyDone = FALSE;
if (alreadyDone)
return;
install_configuration_files();
do_final_setup();
alreadyDone = TRUE;
}
@ -137,13 +152,9 @@ int
installCommit(char *str)
{
installInitial();
make_filesystems();
copy_self();
cpio_extract();
distExtractAll();
install_configuration_files();
do_final_setup();
return 1;
installFinal();
return 0;
}
/* Go newfs and/or mount all the filesystems we've been asked to */
@ -263,50 +274,65 @@ cpio_extract(void)
int i, j, zpid, cpid, pfd[2];
extern int wait(int *status);
while (CpioFD == -1) {
msgConfirm("Please Insert CPIO floppy in floppy drive 0");
CpioFD = open("/dev/rfd0", O_RDONLY);
}
msgNotify("Extracting contents of CPIO floppy...");
pipe(pfd);
zpid = fork();
if (!zpid) {
close(0); dup(CpioFD); close(CpioFD);
close(1); dup(pfd[1]); close(pfd[1]);
close(pfd[0]);
i = execl("/stand/gunzip", "/stand/gunzip", 0);
msgDebug("/stand/gunzip command returns %d status\n", i);
exit(i);
}
cpid = fork();
if (!cpid) {
close(0); dup(pfd[0]); close(pfd[0]);
close(CpioFD);
close(pfd[1]);
if (DebugFD != -1) {
dup2(DebugFD, 1);
dup2(DebugFD, 2);
tryagain:
j = fork();
if (!j) {
while (CpioFD == -1) {
msgConfirm("Please Insert CPIO floppy in floppy drive 0");
CpioFD = open("/dev/rfd0", O_RDONLY);
}
else {
chroot("/mnt"); chdir("/");
msgNotify("Extracting contents of CPIO floppy...");
pipe(pfd);
zpid = fork();
if (!zpid) {
dup2(CpioFD, 0); close(CpioFD);
dup2(pfd[1], 1); close(pfd[1]);
close(pfd[0]);
i = execl("/stand/gunzip", "/stand/gunzip", 0);
msgDebug("/stand/gunzip command returns %d status\n", i);
exit(i);
}
cpid = fork();
if (!cpid) {
dup2(pfd[0], 0); close(pfd[0]);
close(CpioFD);
close(pfd[1]);
if (DebugFD != -1) {
dup2(DebugFD, 1);
dup2(DebugFD, 2);
}
else {
close(1); open("/dev/null", O_WRONLY);
dup2(1, 2);
}
i = execl("/stand/cpio", "/stand/cpio", "-iduvm", 0);
msgDebug("/stand/cpio command returns %d status\n", i);
exit(i);
}
chdir("/mnt");
i = execl("/stand/cpio", "/stand/cpio", "-iduvm", 0);
msgDebug("/stand/cpio command returns %d status\n", i);
exit(i);
close(pfd[0]);
close(pfd[1]);
close(CpioFD);
i = waitpid(zpid, &j, 0);
if (i < 0 || j) {
msgConfirm("gunzip returned status of %d, error was: %s (%d)! Help!", j, strerror(errno), errno);
exit(1);
}
i = waitpid(cpid, &j);
if (i < 0 || j) {
msgConfirm("cpio returned status of %d, error was: %s (%d)! Help!", j, strerror(errno), errno);
exit(2);
}
exit(0);
}
close(pfd[0]);
close(pfd[1]);
close(CpioFD);
i = wait(&j);
if (i < 0 || j)
msgFatal("Pid %d, status %d, cpio=%d, gunzip=%d.\nerror:%s",
i, j, cpid, zpid, strerror(errno));
i = wait(&j);
if (i < 0 || j)
msgFatal("Pid %d, status %d, cpio=%d, gunzip=%d.\nerror:%s",
i, j, cpid, zpid, strerror(errno));
else
i = wait(&j);
if (i < 0 || j || access("/mnt/OK", R_OK) == -1) {
msgConfirm("CPIO floppy did not extract properly! Please verify\n\that your media is correct and try again");
goto tryagain;
}
unlink("/mnt/OK");
}
static void

18
usr.sbin/sysinstall/msg.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: msg.c,v 1.15 1995/05/19 21:30:34 jkh Exp $
* $Id: msg.c,v 1.16 1995/05/20 07:50:20 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -81,8 +81,10 @@ msgInfo(char *fmt, ...)
mvaddstr(23, 0, errstr);
attrset(attrs);
refresh();
if (OnVTY)
if (OnVTY) {
msgDebug("Informational message `%s'\n", errstr);
msgInfo("");
}
free(errstr);
}
@ -179,8 +181,10 @@ msgConfirm(char *fmt, ...)
va_end(args);
use_helpline(NULL);
use_helpfile(NULL);
if (OnVTY)
if (OnVTY) {
msgDebug("User confirmation requested (type ALT-F1)\n");
msgInfo("");
}
dialog_notify(errstr);
free(errstr);
}
@ -219,8 +223,10 @@ msgYesNo(char *fmt, ...)
use_helpline(NULL);
use_helpfile(NULL);
w = dupwin(newscr);
if (OnVTY)
if (OnVTY) {
msgDebug("User decision requested (type ALT-F1)\n");
msgInfo("");
}
ret = dialog_yesno("User Confirmation Requested", errstr, -1, -1);
touchwin(w);
wrefresh(w);
@ -250,8 +256,10 @@ msgGetInput(char *buf, char *fmt, ...)
else
input_buffer[0] = '\0';
w = dupwin(newscr);
if (OnVTY)
if (OnVTY) {
msgDebug("User input requested (type ALT-F1)\n");
msgInfo("");
}
rval = dialog_inputbox("Value Required", errstr, -1, -1, input_buffer);
touchwin(w);
wrefresh(w);

5
usr.sbin/sysinstall/system.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: system.c,v 1.19 1995/05/19 16:58:58 jkh Exp $
* $Id: system.c,v 1.20 1995/05/19 21:30:35 jkh Exp $
*
* Jordan Hubbard
*
@ -304,7 +304,8 @@ vsystem(char *fmt, ...)
case 0: /* child */
(void)sigsetmask(omask);
if (DebugFD != -1) {
msgInfo("Command output is on debugging screen - type ALT-F2 to see it");
if (OnVTY)
msgInfo("Command output is on debugging screen - type ALT-F2 to see it");
dup2(DebugFD, 0);
dup2(DebugFD, 1);
dup2(DebugFD, 2);