update inner chroot scripts to sablink

This commit is contained in:
Mario Fetka
2012-12-09 13:08:43 +01:00
parent cb14beef6d
commit f3d6a1d536
2 changed files with 43 additions and 13 deletions
+17 -3
View File
@@ -148,7 +148,7 @@ done
rm -rf /var/lib/entropy/client/packages
# copy Portage config from sabayonlinux.org entropy repo to system
# copy Portage config from sablink.nas-central.org entropy repo to system
for conf in package.mask package.unmask package.keywords make.conf package.use; do
repo_path=/var/lib/entropy/client/database/*/sabayonlinux.org/standard
repo_conf=$(ls -1 ${repo_path}/*/*/${conf} | sort | tail -n 1 2>/dev/null)
@@ -173,10 +173,24 @@ for conf in 00-sabayon.package.use 00-sabayon.package.mask \
fi
mkdir -p "${target_dir}" # ignore failure
cp "${repo_conf}" "${target_path}" # ignore
fi
done
# NAS addon: overlay Portage config from sablink.nas-central.org if available
for conf in package.mask package.unmask package.keywords make.conf package.use; do
repo_path=/var/lib/entropy/client/database/*/sablink.nas-central.org/standard
repo_conf=$(ls -1 ${repo_path}/*/*/${conf} | sort | tail -n 1 2>/dev/null)
if [ -n "${repo_conf}" ]; then
target_path="/etc/portage/${conf}"
if [ "${conf}" = "make.conf" ]; then
target_path="/etc/make.conf"
fi
if [ ! -d "${target_path}" ]; then # do not touch dirs
cp "${repo_conf}" "${target_path}" # ignore
fi
fi
done
if [ -n "${DRACUT}" ]; then
# Dracut initramfs generation for livecd
# XXX: If you are reading this ..beware!
@@ -208,4 +222,4 @@ RSYNC_URI="rsync://rsync.at.gentoo.org/gentoo-portage/profiles"
PROFILES_DIR="/usr/portage/profiles"
safe_run rsync -av -H -A -X --delete-during "${RSYNC_URI}/" "${PROFILES_DIR}/"
equo query list installed -qv > /etc/sabayon-pkglist
equo query list installed -qv > /etc/sablink-pkglist