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

Remove PkgInteractive hack - it won't work like this.

Browse Source
This commit is contained in:
Jordan K. Hubbard 2000-03-12 03:57:26 +00:00
parent 4951dddb33
commit c87413f73b
11 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/sysinstall/globals.c
View File

@ -47,7 +47,6 @@ Boolean RunningAsInit; /* Are we running as init? */
Boolean DialogActive; /* Is libdialog initialized? */
Boolean ColorDisplay; /* Are we on a color display? */
Boolean OnVTY; /* Are we on a VTY? */
Boolean PkgInteractive; /* Is the package going to spew at us? */
Boolean USAResident; /* Are we cryptographically challenged? */
Variable *VarHead; /* The head of the variable chain */
Device *mediaDevice; /* Where we're installing from */
@ -64,7 +63,6 @@ globalsInit(void)
{
DebugFD = -1;
ColorDisplay = FALSE;
PkgInteractive = FALSE;
Fake = FALSE;
OnVTY = FALSE;
DialogActive = FALSE;

2
release/sysinstall/install.c
View File

@ -571,14 +571,12 @@ nodisks:
"response to the CRYPTO distribution dialog. Do you want to try and\n"
"load the rsaref package from the current media? Some restrictions on\n"
"usage may apply, so be sure to read the package installation output!")) {
PkgInteractive = TRUE;
dialog_clear();
if (DITEM_STATUS(package_add("rsaref")) != DITEM_SUCCESS) {
msgConfirm("Unable to find an rsaref package on the current intallation media.\n"
"You may wish to switch media types and try again, perhaps\n"
"from an FTP server which carries this package.");
}
PkgInteractive = FALSE;
dialog_clear();
}
}

1
release/sysinstall/package.c
View File

@ -167,7 +167,6 @@ package_extract(Device *dev, char *name, Boolean depended)
pid = fork();
if (!pid) {
dup2(pfd[0], 0); close(pfd[0]);
if (!PkgInteractive)
dup2(DebugFD, 1);
close(2);
close(pfd[1]);

1
release/sysinstall/sysinstall.h
View File

@ -341,7 +341,6 @@ extern Boolean RunningAsInit; /* Are we running stand-alone? */
extern Boolean DialogActive; /* Is the dialog() stuff up? */
extern Boolean ColorDisplay; /* Are we on a color display? */
extern Boolean OnVTY; /* On a syscons VTY? */
Boolean PkgInteractive; /* Is the package going to spew at us? */
Boolean USAResident; /* Are we cryptographically challenged? */
extern Variable *VarHead; /* The head of the variable chain */
extern Device *mediaDevice; /* Where we're getting our distribution from */

2
usr.sbin/sade/globals.c
View File

@ -47,7 +47,6 @@ Boolean RunningAsInit; /* Are we running as init? */
Boolean DialogActive; /* Is libdialog initialized? */
Boolean ColorDisplay; /* Are we on a color display? */
Boolean OnVTY; /* Are we on a VTY? */
Boolean PkgInteractive; /* Is the package going to spew at us? */
Boolean USAResident; /* Are we cryptographically challenged? */
Variable *VarHead; /* The head of the variable chain */
Device *mediaDevice; /* Where we're installing from */
@ -64,7 +63,6 @@ globalsInit(void)
{
DebugFD = -1;
ColorDisplay = FALSE;
PkgInteractive = FALSE;
Fake = FALSE;
OnVTY = FALSE;
DialogActive = FALSE;

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

@ -571,14 +571,12 @@ nodisks:
"response to the CRYPTO distribution dialog. Do you want to try and\n"
"load the rsaref package from the current media? Some restrictions on\n"
"usage may apply, so be sure to read the package installation output!")) {
PkgInteractive = TRUE;
dialog_clear();
if (DITEM_STATUS(package_add("rsaref")) != DITEM_SUCCESS) {
msgConfirm("Unable to find an rsaref package on the current intallation media.\n"
"You may wish to switch media types and try again, perhaps\n"
"from an FTP server which carries this package.");
}
PkgInteractive = FALSE;
dialog_clear();
}
}

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

@ -341,7 +341,6 @@ extern Boolean RunningAsInit; /* Are we running stand-alone? */
extern Boolean DialogActive; /* Is the dialog() stuff up? */
extern Boolean ColorDisplay; /* Are we on a color display? */
extern Boolean OnVTY; /* On a syscons VTY? */
Boolean PkgInteractive; /* Is the package going to spew at us? */
Boolean USAResident; /* Are we cryptographically challenged? */
extern Variable *VarHead; /* The head of the variable chain */
extern Device *mediaDevice; /* Where we're getting our distribution from */

2
usr.sbin/sysinstall/globals.c
View File

@ -47,7 +47,6 @@ Boolean RunningAsInit; /* Are we running as init? */
Boolean DialogActive; /* Is libdialog initialized? */
Boolean ColorDisplay; /* Are we on a color display? */
Boolean OnVTY; /* Are we on a VTY? */
Boolean PkgInteractive; /* Is the package going to spew at us? */
Boolean USAResident; /* Are we cryptographically challenged? */
Variable *VarHead; /* The head of the variable chain */
Device *mediaDevice; /* Where we're installing from */
@ -64,7 +63,6 @@ globalsInit(void)
{
DebugFD = -1;
ColorDisplay = FALSE;
PkgInteractive = FALSE;
Fake = FALSE;
OnVTY = FALSE;
DialogActive = FALSE;

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

@ -571,14 +571,12 @@ nodisks:
"response to the CRYPTO distribution dialog. Do you want to try and\n"
"load the rsaref package from the current media? Some restrictions on\n"
"usage may apply, so be sure to read the package installation output!")) {
PkgInteractive = TRUE;
dialog_clear();
if (DITEM_STATUS(package_add("rsaref")) != DITEM_SUCCESS) {
msgConfirm("Unable to find an rsaref package on the current intallation media.\n"
"You may wish to switch media types and try again, perhaps\n"
"from an FTP server which carries this package.");
}
PkgInteractive = FALSE;
dialog_clear();
}
}

1
usr.sbin/sysinstall/package.c
View File

@ -167,7 +167,6 @@ package_extract(Device *dev, char *name, Boolean depended)
pid = fork();
if (!pid) {
dup2(pfd[0], 0); close(pfd[0]);
if (!PkgInteractive)
dup2(DebugFD, 1);
close(2);
close(pfd[1]);

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

@ -341,7 +341,6 @@ extern Boolean RunningAsInit; /* Are we running stand-alone? */
extern Boolean DialogActive; /* Is the dialog() stuff up? */
extern Boolean ColorDisplay; /* Are we on a color display? */
extern Boolean OnVTY; /* On a syscons VTY? */
Boolean PkgInteractive; /* Is the package going to spew at us? */
Boolean USAResident; /* Are we cryptographically challenged? */
extern Variable *VarHead; /* The head of the variable chain */
extern Device *mediaDevice; /* Where we're getting our distribution from */