jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

xbps-src: don't overwrite xbps-conf.plist in chroot if exists.

Browse source
This commit is contained in:
Juan RP 2011-07-02 21:59:06 +02:00
parent 2e053410c6
commit 290703f4fb
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
xbps-src/shutils/chroot.sh.in
View file

@ -198,13 +198,15 @@ create_binsh_symlink()
prepare_binpkg_repos() prepare_binpkg_repos()
{ {
local repo xver local repo xver CONF_FILE
# Copy xbps-conf.plist for XBPS utils >= 0.9.0. # Copy xbps-conf.plist for XBPS utils >= 0.9.0.
xver=$($XBPS_PKGDB_CMD -V|awk '{print $2}') xver=$($XBPS_PKGDB_CMD -V|awk '{print $2}')
if [ -n "$xver" ]; then if [ -n "$xver" ]; then
CONF_FILE=$XBPS_MASTERDIR/usr/local/etc/xbps-conf.plist
for f in /etc /usr/local/etc; do for f in /etc /usr/local/etc; do
if [ -f $f/xbps-conf.plist ]; then if [ -f $f/xbps-conf.plist -a \
! -f $CONF_FILE ]; then
cp -f $f/xbps-conf.plist \ cp -f $f/xbps-conf.plist \
${XBPS_MASTERDIR}/usr/local/etc ${XBPS_MASTERDIR}/usr/local/etc
fi fi