summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-12-08 10:03:00 -0800
committerZac Medico <zmedico@gentoo.org>2011-12-08 10:03:00 -0800
commitf38e5fced3cf96c086093314f5227bc024c20d9b (patch)
tree91bd22659fb04a1f924a5815a650b86d3ff115d5
parent721965014e863a7f385576a919b4e10abf5ce9d5 (diff)
downloadportage-f38e5fced3cf96c086093314f5227bc024c20d9b.tar.gz
portage-f38e5fced3cf96c086093314f5227bc024c20d9b.tar.bz2
portage-f38e5fced3cf96c086093314f5227bc024c20d9b.zip
etc-update: experimental prefix support
-rwxr-xr-xbin/etc-update6
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/etc-update b/bin/etc-update
index 2af04cc4c..5a7ba2a60 100755
--- a/bin/etc-update
+++ b/bin/etc-update
@@ -54,7 +54,7 @@ scan() {
local my_basename
for path in ${CONFIG_PROTECT} ; do
- path="${ROOT}${path}"
+ path="${EROOT}${path}"
# Do not traverse hidden directories such as .svn or .git.
find_opts="-name .* -type d -prune -o -name ._cfg????_*"
if [ ! -d "${path}" ]; then
@@ -74,7 +74,7 @@ scan() {
rpath=$(echo "${file/\/\///}" | sed -e "s:/[^/]*$::")
rfile=$(echo "${file/\/\///}" | sed -e "s:^.*/::")
for mpath in ${CONFIG_PROTECT_MASK}; do
- mpath="${ROOT}${mpath}"
+ mpath="${EROOT}${mpath}"
mpath=$(echo "${mpath/\/\///}")
if [[ "${rpath}" == "${mpath}"* ]]; then
mv ${rpath}/${rfile} ${rpath}/${rfile:10}
@@ -537,7 +537,7 @@ ${SET_X} && set -x
type portageq > /dev/null || exit $?
eval $(portageq envvar -v CONFIG_PROTECT \
- CONFIG_PROTECT_MASK PORTAGE_CONFIGROOT PORTAGE_TMPDIR ROOT USERLAND)
+ CONFIG_PROTECT_MASK PORTAGE_CONFIGROOT PORTAGE_TMPDIR EROOT USERLAND)
export PORTAGE_TMPDIR
TMP="${PORTAGE_TMPDIR}/etc-update-$$"