[PR PATCH] shutils/chroot.sh: fix syslog configuration.

[PR PATCH] shutils/chroot.sh: fix syslog configuration.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 538 bytes --]

There is a new 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: 1443 bytes --]

From 49398900fbc01528bf3658941b0158412a6e79e5 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 | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index ea63bf7e779..1a3fc6a89fc 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' \
@@ -204,6 +201,8 @@ chroot_sync_repodata() {
         cp -f $XBPS_DISTDIR/etc/xbps.d/custom/*.conf $confdir
         cp -f $XBPS_DISTDIR/etc/xbps.d/custom/*.conf $crossconfdir
     fi
+    echo "syslog=false" > $confdir/00-xbps-src.conf
+
     if [ "$CHROOT_READY" ]; then
         hostdir=/host
     else

Re: [PR PATCH] [Updated] shutils/chroot.sh: fix syslog configuration.

[ericonr]

[-- 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
 
 

Re: [PR PATCH] [Merged]: shutils/chroot.sh: fix syslog configuration.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 388 bytes --]

There's a merged pull request on the void-packages repository

shutils/chroot.sh: fix syslog configuration.
https://github.com/void-linux/void-packages/pull/25544

Description:
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