snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity

shutils/chroot.sh: fix syslog configuration. 

The file was created in chroot_prepare(), but the configuration
directory was being cleaned in chroot_sync_repodata(). This commit moves
the configuration to after the directories are created.

Fixes #25534
This commit is contained in:
Érico Rolim 2020-10-12 14:53:51 -03:00 committed by Érico Nogueira Rolim
parent 1cf29bf49b
commit a5ed5f551c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/xbps-src/shutils/chroot.sh
View File

@ -127,9 +127,6 @@ chroot_prepare() {
# Copy /etc/hosts from base-files.
cp -f $XBPS_SRCPKGDIR/base-files/files/hosts $XBPS_MASTERDIR/etc
mkdir -p $XBPS_MASTERDIR/etc/xbps.d
echo "syslog=false" >> $XBPS_MASTERDIR/etc/xbps.d/00-xbps-src.conf
# Prepare default locale: en_US.UTF-8.
if [ -s ${XBPS_MASTERDIR}/etc/default/libc-locales ]; then
printf '%s\n' \
@ -265,6 +262,8 @@ chroot_sync_repodata() {
fi
fi
echo "syslog=false" > $confdir/00-xbps-src.conf
# Copy host repos to the cross root.
if [ -n "$XBPS_CROSS_BUILD" ]; then
rm -rf $XBPS_MASTERDIR/$XBPS_CROSS_BASE/etc/xbps.d
@ -288,6 +287,8 @@ chroot_sync_repodata() {
$crossconfdir/20-repository-remote.conf
fi
fi
echo "syslog=false" > $crossconfdir/00-xbps-src.conf
fi