Bug#943395: runit: Minor fixes to invoke-run
Il giorno dom 3 nov 2019 alle ore 05:55 Dmitry Bogatov ha scritto: > Do you want me to upload #943395 and #942320 right now, or wait for > dh-runit and git-daemon? I think it's better to wait. For git-daemon-run I already have the patch but i'm not able to test it because git fails to build for me. Just haven't had the time to dig a little bit more on this. Thanks, Lorenzo
Bug#943395: runit: Minor fixes to invoke-run
control: tags -1 +pending [2019-10-30 19:45] Lorenzo Puliti > Package: runit > Version: 2.1.2-35 > Followup-For: Bug #943395 > > patch refreshed Thank you. Applied in git. Do you want me to upload #943395 and #942320 right now, or wait for dh-runit and git-daemon? -- Note, that I send and fetch email in batch, once in a few days. Please, mention in body of your reply when you add or remove recepients.
Bug#943395: runit: Minor fixes to invoke-run
Package: runit
Version: 2.1.2-35
Followup-For: Bug #943395
patch refreshed
-- System Information:
Debian Release: bullseye/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 4.20.3-van (SMP w/4 CPU cores; PREEMPT)
Kernel taint flags: TAINT_OOT_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8),
LANGUAGE=en_US:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: runit (via /run/runit.stopit)
Versions of packages runit depends on:
ii libc6 2.29-2
ii sysuser-helper 1.3.3
Versions of packages runit recommends:
ii runit-init 2.1.2-35
runit suggests no packages.
-- Configuration Files:
/etc/default/runit changed [not included]
/etc/runit/3 changed [not included]
-- no debconf information
-- debsums errors found:
debsums: changed file /lib/runit/invoke-run (from runit package)
debsums: changed file /sbin/update-service (from runit package)
>From 9d24842ffdb859894f47142925663d2aee748643 Mon Sep 17 00:00:00 2001
From: Lorenzo Puliti
Date: Wed, 30 Oct 2019 19:32:37 +0100
Subject: [PATCH] Minor improvements to invoke-run
* be verbose about uninstalled binary
* redirect output of {$initscripts} stop to /dev/null (it goes to
service log otherwise); it is confusing to see a stop message during
service startup
Closes: #943395
---
debian/contrib/lib/invoke-run | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/debian/contrib/lib/invoke-run b/debian/contrib/lib/invoke-run
index 2a11306..5a9b4c6 100755
--- a/debian/contrib/lib/invoke-run
+++ b/debian/contrib/lib/invoke-run
@@ -38,6 +38,7 @@ if [ -f "/etc/sv/${service}/.meta/installed" ] ; then
# uninstalled, but not purged. See #929693 and commit [4c485b]
# in dh-runit repository.
if ! [ -f "${installed}" ] ; then
+ echo "runsv: $NAME binary not installed"
sv down "${service}"
exit 0
fi
@@ -69,7 +70,7 @@ if [ -x "${initscript}" ] ; then
exit 0
fi
fi
- "${initscript}" stop
+ "${initscript}" stop >/dev/null
fi
if [ -d "/etc/sv/${service}/conf" ] ; then
--
2.24.0.rc1
Bug#943395: runit: Minor fixes to invoke-run
[2019-10-27 18:31] Lorenz
> > > - "${initscript}" stop
> > > + "${initscript}" stop >/dev/null
> >
> > Why?
> The output from Sysv init script goes to the runit log and it's not
> clear that is from sysv script; also, it's a stop message during a
> start sequence. It's quite confusing.
Reasonable. Can you please refresh patch aganist latest head
(4b1d0685456442f033c00ab0d3cb594d92d0a786), without whitespace changes?
Patch you have sent have missing From: header.
--
Note, that I send and fetch email in batch, once in a few days.
Please, mention in body of your reply when you add or remove recepients.
Bug#943395: runit: Minor fixes to invoke-run
[2019-10-24 13:45] Lorenzo Puliti
> Package: runit
> Version: 2.1.2-35
> Severity: wishlist
> Tags: patch
>
> Hi,
Hi!
> while doing another round of testing with openssh-server i've found
> some minor problem that might need a fix. Detailed description is in
> git commit message.
Something is missing? I see patch 2/2, but not 1/2.
> From bb212cbba9d01476f4a9c29a81c07e7c922c078f Mon Sep 17 00:00:00 2001
> From: Lorenzo Puliti
> Date: Thu, 24 Oct 2019 11:59:05 +0200
> Subject: [PATCH 2/2] minor improvements to invoke-run
>
> * be verbose about uninstalled binary
> * fix indentation in previous patch [1d28c60d] replacing spaces with TAB
> * redirect output of {$initscripts} stop to /dev/null (it goes to
> service log otherwise); it is confusing to see a stop message during
> service startup
> ---
> debian/contrib/lib/invoke-run | 9 +
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/debian/contrib/lib/invoke-run b/debian/contrib/lib/invoke-run
> index 2a11306..54e6d47 100755
> --- a/debian/contrib/lib/invoke-run
> +++ b/debian/contrib/lib/invoke-run
> @@ -38,15 +38,16 @@ if [ -f "/etc/sv/${service}/.meta/installed" ] ; then
> # uninstalled, but not purged. See #929693 and commit [4c485b]
> # in dh-runit repository.
> if ! [ -f "${installed}" ] ; then
> + echo "runsv: $NAME binary not installed"
Does not check for VERBOSE.
> sv down "${service}"
> exit 0
> fi
> fi
>
> if [ -r /etc/default/runit ]; then
> -set -a
> -. /etc/default/runit
> -set +a
> + set -a
> + . /etc/default/runit
> + set +a
> fi
Indentation change. I do not see why it is necessary, but if it is,
please move to separate commit.
> if [ -r "/etc/default/${service}" ] ; then
> @@ -69,7 +70,7 @@ if [ -x "${initscript}" ] ; then
> exit 0
> fi
> fi
> - "${initscript}" stop
> + "${initscript}" stop >/dev/null
Why?
--
Note, that I send and fetch email in batch, once in a few days.
Please, mention in body of your reply when you add or remove recepients.
Bug#943395: runit: Minor fixes to invoke-run
Package: runit
Version: 2.1.2-35
Severity: wishlist
Tags: patch
Hi,
while doing another round of testing with openssh-server i've found some
minor problem that might need a fix.
Detailed description is in git commit message.
Lorenzo
-- System Information:
Debian Release: bullseye/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 4.20.3-van (SMP w/4 CPU cores; PREEMPT)
Kernel taint flags: TAINT_OOT_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8),
LANGUAGE=en_US:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: runit (via /run/runit.stopit)
Versions of packages runit depends on:
ii libc6 2.29-2
ii sysuser-helper 1.3.3
Versions of packages runit recommends:
ii runit-init 2.1.2-35
runit suggests no packages.
-- Configuration Files:
/etc/default/runit changed [not included]
/etc/runit/3 changed [not included]
-- no debconf information
-- debsums errors found:
debsums: changed file /lib/runit/invoke-run (from runit package)
debsums: changed file /sbin/update-service (from runit package)
>From bb212cbba9d01476f4a9c29a81c07e7c922c078f Mon Sep 17 00:00:00 2001
From: Lorenzo Puliti
Date: Thu, 24 Oct 2019 11:59:05 +0200
Subject: [PATCH 2/2] minor improvements to invoke-run
* be verbose about uninstalled binary
* fix indentation in previous patch [1d28c60d] replacing spaces with TAB
* redirect output of {$initscripts} stop to /dev/null (it goes to
service log otherwise); it is confusing to see a stop message during
service startup
---
debian/contrib/lib/invoke-run | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/debian/contrib/lib/invoke-run b/debian/contrib/lib/invoke-run
index 2a11306..54e6d47 100755
--- a/debian/contrib/lib/invoke-run
+++ b/debian/contrib/lib/invoke-run
@@ -38,15 +38,16 @@ if [ -f "/etc/sv/${service}/.meta/installed" ] ; then
# uninstalled, but not purged. See #929693 and commit [4c485b]
# in dh-runit repository.
if ! [ -f "${installed}" ] ; then
+ echo "runsv: $NAME binary not installed"
sv down "${service}"
exit 0
fi
fi
if [ -r /etc/default/runit ]; then
-set -a
-. /etc/default/runit
-set +a
+ set -a
+ . /etc/default/runit
+ set +a
fi
if [ -r "/etc/default/${service}" ] ; then
@@ -69,7 +70,7 @@ if [ -x "${initscript}" ] ; then
exit 0
fi
fi
- "${initscript}" stop
+ "${initscript}" stop >/dev/null
fi
if [ -d "/etc/sv/${service}/conf" ] ; then
--
2.24.0.rc0
