From: ericonr <ericonr@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] shutils/chroot.sh: fix syslog configuration.
Date: Wed, 14 Oct 2020 19:56:17 +0200 [thread overview]
Message-ID: <20201014175617.K05bRk2iqgo4t0u_LHy5hXgYJ5W-qdsaro1F3-ZiC6g@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-25544@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 543 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages chroot
https://github.com/void-linux/void-packages/pull/25544
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
A patch file from https://github.com/void-linux/void-packages/pull/25544.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chroot-25544.patch --]
[-- Type: text/x-diff, Size: 1614 bytes --]
From cbb0cae29101856772ebc520dd1f1cf510ae9077 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 12 Oct 2020 14:53:51 -0300
Subject: [PATCH] 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
---
common/xbps-src/shutils/chroot.sh | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index ea63bf7e779..ba7e231495f 100644
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@@ -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' \
@@ -264,6 +261,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
@@ -287,6 +286,8 @@ chroot_sync_repodata() {
$crossconfdir/20-repository-remote.conf
fi
fi
+
+ echo "syslog=false" > $crossconfdir/00-xbps-src.conf
fi
next prev parent reply other threads:[~2020-10-14 17:56 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-12 17:55 [PR PATCH] " ericonr
2020-10-14 17:56 ` ericonr [this message]
2020-12-11 18:25 ` [PR PATCH] [Merged]: " ericonr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201014175617.K05bRk2iqgo4t0u_LHy5hXgYJ5W-qdsaro1F3-ZiC6g@z \
--to=ericonr@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).