Mercurial > illumos > illumos-gate
changeset 13005:c7857ae656c6
6973324 branded zone support for native zfs commands needs to use python 2.6, not 2.4
6973725 interface exception list needs to know about python2.6
| author | Lori Alt <lori.alt@oracle.com> |
|---|---|
| date | Mon, 02 Aug 2010 15:21:03 -0600 |
| parents | 92dfdb3a48cc |
| children | 659c850dd2a2 |
| files | exception_lists/interface_check usr/src/lib/brand/solaris10/cmd/s10_python_wrapper.sh |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/exception_lists/interface_check Mon Aug 02 14:04:48 2010 -0700 +++ b/exception_lists/interface_check Mon Aug 02 15:21:03 2010 -0600 @@ -56,7 +56,7 @@ PLUGIN ^usr/lib/mdb PLUGIN ^usr/lib/pci PLUGIN ^usr/lib/picl/plugins -PLUGIN ^usr/lib/python2.4 +PLUGIN ^usr/lib/python2.[46] PLUGIN ^usr/lib/rcm/modules PLUGIN ^usr/lib/scsi/plugins PLUGIN ^usr/lib/sysevent/modules
--- a/usr/src/lib/brand/solaris10/cmd/s10_python_wrapper.sh Mon Aug 02 14:04:48 2010 -0700 +++ b/usr/src/lib/brand/solaris10/cmd/s10_python_wrapper.sh Mon Aug 02 15:21:03 2010 -0600 @@ -38,7 +38,7 @@ pyname=$0 n=/.SUNWnative -PYTHONPATH=/.SUNWnative/usr/lib/python2.4/vendor-packages +PYTHONPATH=/.SUNWnative/usr/lib/python2.6/vendor-packages export PYTHONPATH # This wrapper is running in the S10 zone so there is no L10N for the @@ -56,4 +56,4 @@ -e LD_PRELOAD_64=s10_npreload.so.1 \ -e LD_LIBRARY_PATH_32="$n/lib:$n/usr/lib:$n/usr/lib/mps" \ -e LD_LIBRARY_PATH_64="$n/lib/64:$n/usr/lib/64:$n/usr/lib/mps/64" \ - $n/usr/bin/python2.4 $n$pyname "$@" + $n/usr/bin/python2.6 $n$pyname "$@"