upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

We still need a hack for rsaref package; add it. This doesn't

Browse source 
affect CDs since they don't contain the rsaref package anyway.
This commit is contained in:
Jordan K. Hubbard 2000-03-18 08:46:23 +00:00
parent 82b13696f8
commit 54dd58b383
5 changed files with 33 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
release/sysinstall/install.c
View file

@ -52,6 +52,11 @@
#include <unistd.h>
#include <termios.h>
/* Hack for rsaref package add, which displays interactive license.
* Used by package.c
*/
int _interactiveHack;
static void create_termcap(void);
static void fixit_common(void);
@ -572,6 +577,7 @@ nodisks:
"load the rsaref package from the current media? Some restrictions on\n"
"usage may apply, so be sure to read the package installation output!")) {
dialog_clear();
_interactiveHack = 1;
if (DITEM_STATUS(package_add("rsaref")) != DITEM_SUCCESS) {
msgConfirm("Unable to find an rsaref package on the current intallation media.\n"
"This is probably because you are installing from a CDROM which\n"
@ -581,6 +587,7 @@ nodisks:
"the rsaref package manually through the Packages menu.");
}
dialog_clear();
_interactiveHack = 0;
}
}
else {

8
release/sysinstall/package.c
View file

@ -166,9 +166,13 @@ package_extract(Device *dev, char *name, Boolean depended)
pipe(pfd);
pid = fork();
if (!pid) {
extern int _interactiveHack;
dup2(pfd[0], 0); close(pfd[0]);
dup2(DebugFD, 1);
close(2);
if (!_interactiveHack) {
dup2(DebugFD, 1);
close(2);
}
close(pfd[1]);
if (isDebug())
i = execl("/usr/sbin/pkg_add", "/usr/sbin/pkg_add", "-v", "-", 0);

7
usr.sbin/sade/install.c
View file

@ -52,6 +52,11 @@
#include <unistd.h>
#include <termios.h>
/* Hack for rsaref package add, which displays interactive license.
* Used by package.c
*/
int _interactiveHack;
static void create_termcap(void);
static void fixit_common(void);
@ -572,6 +577,7 @@ nodisks:
"load the rsaref package from the current media? Some restrictions on\n"
"usage may apply, so be sure to read the package installation output!")) {
dialog_clear();
_interactiveHack = 1;
if (DITEM_STATUS(package_add("rsaref")) != DITEM_SUCCESS) {
msgConfirm("Unable to find an rsaref package on the current intallation media.\n"
"This is probably because you are installing from a CDROM which\n"
@ -581,6 +587,7 @@ nodisks:
"the rsaref package manually through the Packages menu.");
}
dialog_clear();
_interactiveHack = 0;
}
}
else {

7
usr.sbin/sysinstall/install.c
View file

@ -52,6 +52,11 @@
#include <unistd.h>
#include <termios.h>
/* Hack for rsaref package add, which displays interactive license.
* Used by package.c
*/
int _interactiveHack;
static void create_termcap(void);
static void fixit_common(void);
@ -572,6 +577,7 @@ nodisks:
"load the rsaref package from the current media? Some restrictions on\n"
"usage may apply, so be sure to read the package installation output!")) {
dialog_clear();
_interactiveHack = 1;
if (DITEM_STATUS(package_add("rsaref")) != DITEM_SUCCESS) {
msgConfirm("Unable to find an rsaref package on the current intallation media.\n"
"This is probably because you are installing from a CDROM which\n"
@ -581,6 +587,7 @@ nodisks:
"the rsaref package manually through the Packages menu.");
}
dialog_clear();
_interactiveHack = 0;
}
}
else {

8
usr.sbin/sysinstall/package.c
View file

@ -166,9 +166,13 @@ package_extract(Device *dev, char *name, Boolean depended)
pipe(pfd);
pid = fork();
if (!pid) {
extern int _interactiveHack;
dup2(pfd[0], 0); close(pfd[0]);
dup2(DebugFD, 1);
close(2);
if (!_interactiveHack) {
dup2(DebugFD, 1);
close(2);
}
close(pfd[1]);
if (isDebug())
i = execl("/usr/sbin/pkg_add", "/usr/sbin/pkg_add", "-v", "-", 0);