diff options
| author | Garrett D'Amore <garrett@nexenta.com> | 2010-11-19 14:02:57 -0800 |
|---|---|---|
| committer | Garrett D'Amore <garrett@nexenta.com> | 2010-11-19 14:02:57 -0800 |
| commit | 382f00c9f2bd34208f10bb7d2be96bc6696eb8c4 (patch) | |
| tree | 0b05c4d7f1bfe7833181dc0a0b81b6d274fc227b /usr/src/cmd/svr4pkg/pkginstall/main.c | |
| parent | 6c1891ea28c10049521d8647a32ef85d9449a8cb (diff) | |
| download | illumos-gate-382f00c9f2bd34208f10bb7d2be96bc6696eb8c4.tar.gz | |
424 svr4pkg should remove ALLOW_EXCEPTION_LIST_PKG
Reviewed by: albert.lee@nexenta.com
Approved by: gwr@nexenta.com
Diffstat (limited to 'usr/src/cmd/svr4pkg/pkginstall/main.c')
| -rw-r--r-- | usr/src/cmd/svr4pkg/pkginstall/main.c | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/usr/src/cmd/svr4pkg/pkginstall/main.c b/usr/src/cmd/svr4pkg/pkginstall/main.c index 1e6c46cb56..5fc0a69fef 100644 --- a/usr/src/cmd/svr4pkg/pkginstall/main.c +++ b/usr/src/cmd/svr4pkg/pkginstall/main.c @@ -197,11 +197,6 @@ static char *parentZoneType = (char *)NULL; #define MALSIZ 4 /* best guess at likely maximum value of MAXINST */ #define LSIZE 256 /* maximum line size supported in copyright file */ -#ifdef ALLOW_EXCEPTION_PKG_LIST -#define SCRIPT 0 /* which exception_pkg() pkg list to use (SCRIPTS) */ -#define LINK 1 /* which exception_pkg() pkg list to use (SYMLINKS) */ -#endif - #if !defined(TEXT_DOMAIN) /* Should be defined by cc -D */ #define TEXT_DOMAIN "SYS_TEST" #endif @@ -1246,43 +1241,11 @@ main(int argc, char *argv[]) non_abi_scripts = 1; } -#ifdef ALLOW_EXCEPTION_PKG_LIST - /* - * ********************************************************************* - * this feature is removed starting with Solaris 10 - there is no built - * in list of packages that should be run "the old way" - * ********************************************************************* - */ - - else if (exception_pkg(srcinst, SCRIPT)) { - /* - * Until on1095, set it from exception package names as - * well. - */ - putparam("NONABI_SCRIPTS", "TRUE"); - script_in = PROC_XSTDIN; - non_abi_scripts = 1; - } -#endif - /* Set symlinks to be processed the old way */ if (abi_sym_ptr && strncasecmp(abi_sym_ptr, "TRUE", 4) == 0) { set_nonABI_symlinks(); } - /* - * ********************************************************************* - * this feature is removed starting with Solaris 10 - there is no built - * in list of packages that should be run "the old way" - * ********************************************************************* - */ -#ifdef ALLOW_EXCEPTION_PKG_LIST - else if (exception_pkg(srcinst, LINK)) { - /* Until 2.9, set it from the execption list */ - putparam("PKG_NONABI_SYMLINKS", "TRUE"); - set_nonABI_symlinks(); - } -#endif /* * At this point, script_in, non_abi_scripts & the environment are * all set correctly for the ABI status of the package. |