* [PATCH] busybox: move syslog config to /etc/default
@ 2011-01-12 1:43 Chris Larson
2011-01-12 7:32 ` Koen Kooi
` (4 more replies)
0 siblings, 5 replies; 9+ messages in thread
From: Chris Larson @ 2011-01-12 1:43 UTC (permalink / raw)
To: openembedded-devel; +Cc: Chris Larson
From: Chris Larson <chris_larson@mentor.com>
The busybox syslog syslog.conf is parsed by the /etc/init.d script, not by the
syslog process itself, so it belongs in /etc/default. In addition, the file
format is *completely* different from the standard sysklogd configuration, so
while we should resolve the file conflict between busybox-syslog and sysklogd,
we should not use update-alternatives for it, so this is a cleaner solution.
Signed-off-by: Chris Larson <chris_larson@mentor.com>
---
recipes/busybox/busybox.inc | 13 +++++++++----
recipes/busybox/files/syslog | 4 ++--
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/recipes/busybox/busybox.inc b/recipes/busybox/busybox.inc
index a9d1e6e..1106910 100644
--- a/recipes/busybox/busybox.inc
+++ b/recipes/busybox/busybox.inc
@@ -11,7 +11,7 @@ LICENSE = "GPLv2"
SECTION = "base"
PRIORITY = "required"
-INC_PR = "r38"
+INC_PR = "r39"
SRC_URI = "\
file://busybox-cron \
@@ -47,7 +47,8 @@ RDEPENDS_${PN} += "${PN}-mountall"
RRECOMMENDS_${PN} += "libgcc ${PN}-syslog"
FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www"
-FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog.${PN} ${sysconfdir}/syslog.conf"
+FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog.${PN} \
+ ${sysconfdir}/default/syslog"
FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd"
FILES_${PN} += "${datadir}/udhcpc"
@@ -58,7 +59,7 @@ INITSCRIPT_PACKAGES = "${PN}-httpd ${PN}-udhcpd"
INITSCRIPT_NAME_${PN}-httpd = "busybox-httpd"
INITSCRIPT_NAME_${PN}-syslog = "syslog"
INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd"
-CONFFILES_${PN}-syslog = "${sysconfdir}/syslog.conf"
+CONFFILES_${PN}-syslog = "${sysconfdir}/default/syslog"
# This disables the syslog startup links in slugos (see slugos-init)
INITSCRIPT_PARAMS_${PN}-syslog_slugos = "start 20 ."
@@ -168,7 +169,11 @@ do_install () {
if grep -q "CONFIG_SYSLOGD=y" ${WORKDIR}/defconfig; then
install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/syslog.${PN}
- install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/
+ sed -i -e 's,/etc/default/syslog,${sysconfdir}/default/syslog,' \
+ ${D}${sysconfdir}/init.d/syslog.${PN}
+
+ install -d ${D}${sysconfdir}/default
+ install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/default/syslog
fi
if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then
install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/
diff --git a/recipes/busybox/files/syslog b/recipes/busybox/files/syslog
index 61d273b..6e86346 100644
--- a/recipes/busybox/files/syslog
+++ b/recipes/busybox/files/syslog
@@ -5,8 +5,8 @@
# Configuration file added by <bruno.randolf@4g-systems.biz>
set -e
-if [ -f /etc/syslog.conf ]; then
- . /etc/syslog.conf
+if [ -f /etc/default/syslog ]; then
+ . /etc/default/syslog
LOG_LOCAL=0
LOG_REMOTE=0
for D in $DESTINATION; do
--
1.7.2.3
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH] busybox: move syslog config to /etc/default
2011-01-12 1:43 [PATCH] busybox: move syslog config to /etc/default Chris Larson
2011-01-12 7:32 ` Koen Kooi
@ 2011-01-12 7:32 ` Koen Kooi
2011-01-12 7:33 ` Khem Raj
` (2 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Koen Kooi @ 2011-01-12 7:32 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 12-01-11 02:43, Chris Larson wrote:
Acked-by: Koen Kooi <koen@openembedded.org>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFNLVkQMkyGM64RGpERAsvJAJ0X3LKCZa/UGKCEyhi8ZVqm2H2hogCfeZEL
0BTGsNqRWq/HzGg/TXA1lrY=
=a4z6
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] busybox: move syslog config to /etc/default
2011-01-12 1:43 [PATCH] busybox: move syslog config to /etc/default Chris Larson
@ 2011-01-12 7:32 ` Koen Kooi
2011-01-12 7:32 ` Koen Kooi
` (3 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Koen Kooi @ 2011-01-12 7:32 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 12-01-11 02:43, Chris Larson wrote:
> From: Chris Larson <chris_larson@mentor.com>
>
> The busybox syslog syslog.conf is parsed by the /etc/init.d script, not by the
> syslog process itself, so it belongs in /etc/default. In addition, the file
> format is *completely* different from the standard sysklogd configuration, so
> while we should resolve the file conflict between busybox-syslog and sysklogd,
> we should not use update-alternatives for it, so this is a cleaner solution.
>
> Signed-off-by: Chris Larson <chris_larson@mentor.com>
Acked-by: Koen Kooi <koen@openembedded.org>
> ---
> recipes/busybox/busybox.inc | 13 +++++++++----
> recipes/busybox/files/syslog | 4 ++--
> 2 files changed, 11 insertions(+), 6 deletions(-)
>
> diff --git a/recipes/busybox/busybox.inc b/recipes/busybox/busybox.inc
> index a9d1e6e..1106910 100644
> --- a/recipes/busybox/busybox.inc
> +++ b/recipes/busybox/busybox.inc
> @@ -11,7 +11,7 @@ LICENSE = "GPLv2"
> SECTION = "base"
> PRIORITY = "required"
>
> -INC_PR = "r38"
> +INC_PR = "r39"
>
> SRC_URI = "\
> file://busybox-cron \
> @@ -47,7 +47,8 @@ RDEPENDS_${PN} += "${PN}-mountall"
> RRECOMMENDS_${PN} += "libgcc ${PN}-syslog"
>
> FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www"
> -FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog.${PN} ${sysconfdir}/syslog.conf"
> +FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog.${PN} \
> + ${sysconfdir}/default/syslog"
> FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd"
>
> FILES_${PN} += "${datadir}/udhcpc"
> @@ -58,7 +59,7 @@ INITSCRIPT_PACKAGES = "${PN}-httpd ${PN}-udhcpd"
> INITSCRIPT_NAME_${PN}-httpd = "busybox-httpd"
> INITSCRIPT_NAME_${PN}-syslog = "syslog"
> INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd"
> -CONFFILES_${PN}-syslog = "${sysconfdir}/syslog.conf"
> +CONFFILES_${PN}-syslog = "${sysconfdir}/default/syslog"
>
> # This disables the syslog startup links in slugos (see slugos-init)
> INITSCRIPT_PARAMS_${PN}-syslog_slugos = "start 20 ."
> @@ -168,7 +169,11 @@ do_install () {
>
> if grep -q "CONFIG_SYSLOGD=y" ${WORKDIR}/defconfig; then
> install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/syslog.${PN}
> - install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/
> + sed -i -e 's,/etc/default/syslog,${sysconfdir}/default/syslog,' \
> + ${D}${sysconfdir}/init.d/syslog.${PN}
> +
> + install -d ${D}${sysconfdir}/default
> + install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/default/syslog
> fi
> if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then
> install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/
> diff --git a/recipes/busybox/files/syslog b/recipes/busybox/files/syslog
> index 61d273b..6e86346 100644
> --- a/recipes/busybox/files/syslog
> +++ b/recipes/busybox/files/syslog
> @@ -5,8 +5,8 @@
> # Configuration file added by <bruno.randolf@4g-systems.biz>
> set -e
>
> -if [ -f /etc/syslog.conf ]; then
> - . /etc/syslog.conf
> +if [ -f /etc/default/syslog ]; then
> + . /etc/default/syslog
> LOG_LOCAL=0
> LOG_REMOTE=0
> for D in $DESTINATION; do
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFNLVkQMkyGM64RGpERAsvJAJ9WbhU0dw3A3KhaBElGnWOD7kR00ACgjCOC
XnbydKbwxeyr+YooJQoOYpg=
=evbp
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] busybox: move syslog config to /etc/default
2011-01-12 1:43 [PATCH] busybox: move syslog config to /etc/default Chris Larson
2011-01-12 7:32 ` Koen Kooi
2011-01-12 7:32 ` Koen Kooi
@ 2011-01-12 7:33 ` Khem Raj
2011-01-12 14:21 ` Chris Larson
2011-01-12 7:43 ` Steffen Sledz
2011-01-19 20:10 ` Martin Jansa
4 siblings, 1 reply; 9+ messages in thread
From: Khem Raj @ 2011-01-12 7:33 UTC (permalink / raw)
To: openembedded-devel
On 1/11/2011 5:43 PM, Chris Larson wrote:
> From: Chris Larson<chris_larson@mentor.com>
>
> The busybox syslog syslog.conf is parsed by the /etc/init.d script, not by the
> syslog process itself, so it belongs in /etc/default. In addition, the file
> format is *completely* different from the standard sysklogd configuration, so
> while we should resolve the file conflict between busybox-syslog and sysklogd,
> we should not use update-alternatives for it, so this is a cleaner solution.
>
> Signed-off-by: Chris Larson<chris_larson@mentor.com>
looks ok will upgrade paths work ok after this change
Acked-by: Khem Raj <raj.khem@gmail.com>
> ---
> recipes/busybox/busybox.inc | 13 +++++++++----
> recipes/busybox/files/syslog | 4 ++--
> 2 files changed, 11 insertions(+), 6 deletions(-)
>
> diff --git a/recipes/busybox/busybox.inc b/recipes/busybox/busybox.inc
> index a9d1e6e..1106910 100644
> --- a/recipes/busybox/busybox.inc
> +++ b/recipes/busybox/busybox.inc
> @@ -11,7 +11,7 @@ LICENSE = "GPLv2"
> SECTION = "base"
> PRIORITY = "required"
>
> -INC_PR = "r38"
> +INC_PR = "r39"
>
> SRC_URI = "\
> file://busybox-cron \
> @@ -47,7 +47,8 @@ RDEPENDS_${PN} += "${PN}-mountall"
> RRECOMMENDS_${PN} += "libgcc ${PN}-syslog"
>
> FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www"
> -FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog.${PN} ${sysconfdir}/syslog.conf"
> +FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog.${PN} \
> + ${sysconfdir}/default/syslog"
> FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd"
>
> FILES_${PN} += "${datadir}/udhcpc"
> @@ -58,7 +59,7 @@ INITSCRIPT_PACKAGES = "${PN}-httpd ${PN}-udhcpd"
> INITSCRIPT_NAME_${PN}-httpd = "busybox-httpd"
> INITSCRIPT_NAME_${PN}-syslog = "syslog"
> INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd"
> -CONFFILES_${PN}-syslog = "${sysconfdir}/syslog.conf"
> +CONFFILES_${PN}-syslog = "${sysconfdir}/default/syslog"
>
> # This disables the syslog startup links in slugos (see slugos-init)
> INITSCRIPT_PARAMS_${PN}-syslog_slugos = "start 20 ."
> @@ -168,7 +169,11 @@ do_install () {
>
> if grep -q "CONFIG_SYSLOGD=y" ${WORKDIR}/defconfig; then
> install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/syslog.${PN}
> - install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/
> + sed -i -e 's,/etc/default/syslog,${sysconfdir}/default/syslog,' \
> + ${D}${sysconfdir}/init.d/syslog.${PN}
> +
> + install -d ${D}${sysconfdir}/default
> + install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/default/syslog
> fi
> if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then
> install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/
> diff --git a/recipes/busybox/files/syslog b/recipes/busybox/files/syslog
> index 61d273b..6e86346 100644
> --- a/recipes/busybox/files/syslog
> +++ b/recipes/busybox/files/syslog
> @@ -5,8 +5,8 @@
> # Configuration file added by<bruno.randolf@4g-systems.biz>
> set -e
>
> -if [ -f /etc/syslog.conf ]; then
> - . /etc/syslog.conf
> +if [ -f /etc/default/syslog ]; then
> + . /etc/default/syslog
> LOG_LOCAL=0
> LOG_REMOTE=0
> for D in $DESTINATION; do
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] busybox: move syslog config to /etc/default
2011-01-12 1:43 [PATCH] busybox: move syslog config to /etc/default Chris Larson
` (2 preceding siblings ...)
2011-01-12 7:33 ` Khem Raj
@ 2011-01-12 7:43 ` Steffen Sledz
2011-01-12 14:22 ` Chris Larson
2011-01-19 20:10 ` Martin Jansa
4 siblings, 1 reply; 9+ messages in thread
From: Steffen Sledz @ 2011-01-12 7:43 UTC (permalink / raw)
To: openembedded-devel; +Cc: Chris Larson
Am 12.01.2011 02:43, schrieb Chris Larson:
> From: Chris Larson <chris_larson@mentor.com>
>
> The busybox syslog syslog.conf is parsed by the /etc/init.d script, not by the
> syslog process itself, so it belongs in /etc/default. In addition, the file
> format is *completely* different from the standard sysklogd configuration, so
> while we should resolve the file conflict between busybox-syslog and sysklogd,
> we should not use update-alternatives for it, so this is a cleaner solution.
Moving the file into /etc/default seems to be OK for me.
But i would suggest to rename the config file itself to busybox-syslog, because it does not contain (default) configuration for any syslog incarnation but only for busybox-syslog.
Steffen
--
Steffen Sledz
DResearch Digital Media Systems GmbH
Otto-Schmirgal-Str.3, D-10319 Berlin, Germany
Tel: +49 (30) 515932237 mailto:sledz@DResearch.DE
Fax: +49 (30) 515932299 http://www.DResearch.DE
Geschäftsführer: Dr. Michael Weber, Werner Mögle;
Amtsgericht Berlin Charlottenburg; HRB 54412;
Ust.-IDNr. DE169013825; WEEE Reg.-Nr. DE 85995642
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] busybox: move syslog config to /etc/default
2011-01-12 7:33 ` Khem Raj
@ 2011-01-12 14:21 ` Chris Larson
0 siblings, 0 replies; 9+ messages in thread
From: Chris Larson @ 2011-01-12 14:21 UTC (permalink / raw)
To: openembedded-devel
On Wed, Jan 12, 2011 at 12:33 AM, Khem Raj <raj.khem@gmail.com> wrote:
> On 1/11/2011 5:43 PM, Chris Larson wrote:
>>
>> From: Chris Larson<chris_larson@mentor.com>
>>
>> The busybox syslog syslog.conf is parsed by the /etc/init.d script, not by
>> the
>> syslog process itself, so it belongs in /etc/default. In addition, the
>> file
>> format is *completely* different from the standard sysklogd configuration,
>> so
>> while we should resolve the file conflict between busybox-syslog and
>> sysklogd,
>> we should not use update-alternatives for it, so this is a cleaner
>> solution.
>>
>> Signed-off-by: Chris Larson<chris_larson@mentor.com>
>
> looks ok will upgrade paths work ok after this change
>
> Acked-by: Khem Raj <raj.khem@gmail.com>
Hmm, I suspect that if the user modified the busybox /etc/syslog.conf,
opkg would leave their version behind with a different filename,
rather than blindly removing a user edited conffile, but of course the
new one in /etc/default wouldn't include any of the old user
customizations. I'll look into this a bit more closely. Thanks.
--
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] busybox: move syslog config to /etc/default
2011-01-12 7:43 ` Steffen Sledz
@ 2011-01-12 14:22 ` Chris Larson
0 siblings, 0 replies; 9+ messages in thread
From: Chris Larson @ 2011-01-12 14:22 UTC (permalink / raw)
To: Steffen Sledz; +Cc: Chris Larson, openembedded-devel
On Wed, Jan 12, 2011 at 12:43 AM, Steffen Sledz <sledz@dresearch.de> wrote:
> Am 12.01.2011 02:43, schrieb Chris Larson:
>> From: Chris Larson <chris_larson@mentor.com>
>>
>> The busybox syslog syslog.conf is parsed by the /etc/init.d script, not by the
>> syslog process itself, so it belongs in /etc/default. In addition, the file
>> format is *completely* different from the standard sysklogd configuration, so
>> while we should resolve the file conflict between busybox-syslog and sysklogd,
>> we should not use update-alternatives for it, so this is a cleaner solution.
>
> Moving the file into /etc/default seems to be OK for me.
>
> But i would suggest to rename the config file itself to busybox-syslog, because it does not contain (default) configuration for any syslog incarnation but only for busybox-syslog.
Good point, will do. Thanks.
--
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] busybox: move syslog config to /etc/default
2011-01-12 1:43 [PATCH] busybox: move syslog config to /etc/default Chris Larson
` (3 preceding siblings ...)
2011-01-12 7:43 ` Steffen Sledz
@ 2011-01-19 20:10 ` Martin Jansa
2011-01-20 1:00 ` Chris Larson
4 siblings, 1 reply; 9+ messages in thread
From: Martin Jansa @ 2011-01-19 20:10 UTC (permalink / raw)
To: openembedded-devel; +Cc: Chris Larson
On Wed, Jan 12, 2011 at 2:43 AM, Chris Larson <kergoth@gmail.com> wrote:
> From: Chris Larson <chris_larson@mentor.com>
>
> The busybox syslog syslog.conf is parsed by the /etc/init.d script, not by the
> syslog process itself, so it belongs in /etc/default. In addition, the file
> format is *completely* different from the standard sysklogd configuration, so
> while we should resolve the file conflict between busybox-syslog and sysklogd,
> we should not use update-alternatives for it, so this is a cleaner solution.
>
> Signed-off-by: Chris Larson <chris_larson@mentor.com>
> ---
> recipes/busybox/busybox.inc | 13 +++++++++----
> recipes/busybox/files/syslog | 4 ++--
> 2 files changed, 11 insertions(+), 6 deletions(-)
>
> diff --git a/recipes/busybox/busybox.inc b/recipes/busybox/busybox.inc
> index a9d1e6e..1106910 100644
> --- a/recipes/busybox/busybox.inc
> +++ b/recipes/busybox/busybox.inc
> @@ -11,7 +11,7 @@ LICENSE = "GPLv2"
> SECTION = "base"
> PRIORITY = "required"
>
> -INC_PR = "r38"
> +INC_PR = "r39"
>
> SRC_URI = "\
> file://busybox-cron \
> @@ -47,7 +47,8 @@ RDEPENDS_${PN} += "${PN}-mountall"
> RRECOMMENDS_${PN} += "libgcc ${PN}-syslog"
>
> FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www"
> -FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog.${PN} ${sysconfdir}/syslog.conf"
> +FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog.${PN} \
> + ${sysconfdir}/default/syslog"
> FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd"
>
> FILES_${PN} += "${datadir}/udhcpc"
> @@ -58,7 +59,7 @@ INITSCRIPT_PACKAGES = "${PN}-httpd ${PN}-udhcpd"
> INITSCRIPT_NAME_${PN}-httpd = "busybox-httpd"
> INITSCRIPT_NAME_${PN}-syslog = "syslog"
> INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd"
> -CONFFILES_${PN}-syslog = "${sysconfdir}/syslog.conf"
> +CONFFILES_${PN}-syslog = "${sysconfdir}/default/syslog"
>
> # This disables the syslog startup links in slugos (see slugos-init)
> INITSCRIPT_PARAMS_${PN}-syslog_slugos = "start 20 ."
> @@ -168,7 +169,11 @@ do_install () {
>
> if grep -q "CONFIG_SYSLOGD=y" ${WORKDIR}/defconfig; then
> install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/syslog.${PN}
> - install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/
> + sed -i -e 's,/etc/default/syslog,${sysconfdir}/default/syslog,' \
> + ${D}${sysconfdir}/init.d/syslog.${PN}
Hi,
Here it's right but to OE you've pushed version of patch where it is
also renamed to
default/busybox-syslog, but that patern in sed call
's,/etc/default/busybox-syslog,' should still read
's,/etc/default/syslog,', otherwise nothing is replaced and
syslog.busybox is still trying to read /etc/default/syslog which does
not exist
or rename it to busybox-syslog in files/syslog file too
http://git.openembedded.org/cgit.cgi/openembedded/commit/recipes/busybox/files/syslog?id=a25c0750c7892990c59e8d6048b8c4d99410bcee
Regards,
+ sed -i -e
's,/etc/default/busybox-syslog,${sysconfdir}/default/busybox-syslog,'
\
+ ${D}${sysconfdir}/init.d/syslog.${PN}
> +
> + install -d ${D}${sysconfdir}/default
> + install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/default/syslog
> fi
> if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then
> install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/
> diff --git a/recipes/busybox/files/syslog b/recipes/busybox/files/syslog
> index 61d273b..6e86346 100644
> --- a/recipes/busybox/files/syslog
> +++ b/recipes/busybox/files/syslog
> @@ -5,8 +5,8 @@
> # Configuration file added by <bruno.randolf@4g-systems.biz>
> set -e
>
> -if [ -f /etc/syslog.conf ]; then
> - . /etc/syslog.conf
> +if [ -f /etc/default/syslog ]; then
> + . /etc/default/syslog
> LOG_LOCAL=0
> LOG_REMOTE=0
> for D in $DESTINATION; do
> --
> 1.7.2.3
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] busybox: move syslog config to /etc/default
2011-01-19 20:10 ` Martin Jansa
@ 2011-01-20 1:00 ` Chris Larson
0 siblings, 0 replies; 9+ messages in thread
From: Chris Larson @ 2011-01-20 1:00 UTC (permalink / raw)
To: openembedded-devel
On Wed, Jan 19, 2011 at 1:10 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> Here it's right but to OE you've pushed version of patch where it is
> also renamed to
> default/busybox-syslog, but that patern in sed call
> 's,/etc/default/busybox-syslog,' should still read
> 's,/etc/default/syslog,', otherwise nothing is replaced and
> syslog.busybox is still trying to read /etc/default/syslog which does
> not exist
>
> or rename it to busybox-syslog in files/syslog file too
> http://git.openembedded.org/cgit.cgi/openembedded/commit/recipes/busybox/files/syslog?id=a25c0750c7892990c59e8d6048b8c4d99410bcee
>
Bah, damnit, thanks. Well spotted.
--
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2011-01-20 1:01 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-01-12 1:43 [PATCH] busybox: move syslog config to /etc/default Chris Larson
2011-01-12 7:32 ` Koen Kooi
2011-01-12 7:32 ` Koen Kooi
2011-01-12 7:33 ` Khem Raj
2011-01-12 14:21 ` Chris Larson
2011-01-12 7:43 ` Steffen Sledz
2011-01-12 14:22 ` Chris Larson
2011-01-19 20:10 ` Martin Jansa
2011-01-20 1:00 ` Chris Larson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.