--- eselect-1.0.8/modules/env.eselect~ 2007-01-14 21:55:01.000000000 +0100 +++ eselect-1.0.8/modules/env.eselect 2007-03-28 00:09:38.000000000 +0200 @@ -256,6 +256,7 @@ describe_update_options() { echo "makelinks : Specify \"makelinks\" to force updating of links" + echo "--no-ldconfig : Do not run ldconfig" } do_update() { @@ -266,12 +267,24 @@ touch ${ROOT}/etc/profile.env fi + local mlinks noldconfig + while [[ ${1} ]]; do + case ${1} in + makelinks) mlinks=1 ;; + --no-ldconfig) noldconfig=1 ;; + *) die -q "Unknown parameter ${1}" ;; + esac + shift + done + # Create configuration files create_profile_env - create_ld_so_conf - [[ -e ${ROOT}/usr/sbin/prelink ]] && create_prelink_conf - makelinks=$( ( need_links || [[ ${1} == makelinks ]] ) && echo "-X" ) - update_ldcache ${makelinks} + if [[ -z "${noldconfig}" ]]; then + create_ld_so_conf + [[ -e ${ROOT}/usr/sbin/prelink ]] && create_prelink_conf + makelinks=$( ( need_links || [[ "${mlinks}" ]] ) && echo "-X" ) + update_ldcache ${makelinks} + fi # fix up ${ENVPROFILE} cp ${ENVPROFILE} ${ENVPROFILE/.env/.csh}