From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6634399131619033088 X-Received: by 2002:a5d:6b52:: with SMTP id x18mr1981359wrw.19.1545223283528; Wed, 19 Dec 2018 04:41:23 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:4987:: with SMTP id w129ls1008731wma.13.gmail; Wed, 19 Dec 2018 04:41:23 -0800 (PST) X-Google-Smtp-Source: AFSGD/X1szyYD+kGrqdVaEZFGbErWHwmDBa0Lq/RAQpwoYvr9dRTGSAiQfvyc9eWdXHixvghpxXq X-Received: by 2002:a1c:6584:: with SMTP id z126mr777087wmb.18.1545223282871; Wed, 19 Dec 2018 04:41:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545223282; cv=none; d=google.com; s=arc-20160816; b=07isywQs2CO4ugzAXAmjqn0M77hQHxW2bTSQIhPcC0Yj1iSWanwjhSe5dEgji+bOxM PhNL3nE4JlixRu0wC0UGuEI0O49f2DOgyLq5RHOpI4oNFmDtN/smnbEeLSl/YhEP8y33 HRjywZq8KsM0keVt04aBHUnNkj/04nrUizwbxUxqzHiHaqDmg1/7kYkZT+YvQLawxygd 7NO0yOQX4vOEEEnGOVYGyrf7yE+aDbYKkCKaQjuuz19kTW646ih83wbCIEeNX+EErgIx E724nf7smXCmF7ewE0Mdj7wnd7IWJSEuReTtxcwjoIoV7wbomi47FdTI8oNSqsvXFYMb UjoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date; bh=zqjDDBT9kmzr9p0qO9g7Z8vZnEEEKXcU/D2LzelHpGA=; b=vuV/ddhaM8HntzPiDrND8jXb+eRv+7dw2M7m5g+jVbL4lK86YaSdEj9mtHW0/CiPvb dmWLp0ANs+LzdPeE4UMN/cNtfYD95NsHaaNd19hv+K0E9CiwiVSlECQRPjHNPqOgB6Dx bn9ixyPATmwtpS3vzj3zqTOXIjzzhd4rB4B2+MqDCPNtY1xBWP+wNSzXUiXprOnMmfU+ RG3yXst4JH7OW/auhVydbuJRddD8bHMOCv4dmbQR2V8hWz1CsgneAGRFVD5eAL5jLoXX d/rd16w6Pj0Ut33U3dmXkJyDtKFSxS1IQniyWXGQse2QDryWh+Pt5n2igS56m1zy99Mq t9og== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id x188si185987wmb.3.2018.12.19.04.41.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Dec 2018 04:41:22 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id wBJCfMYO030969 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 19 Dec 2018 13:41:22 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.69.6]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id wBJCfMMO027408; Wed, 19 Dec 2018 13:41:22 +0100 Date: Wed, 19 Dec 2018 13:41:21 +0100 From: Henning Schild To: Harald Seiler Cc: Subject: Re: [PATCH v2] sshd-regen-keys: Fix sshd deadlock on boot Message-ID: <20181219134121.6b540490@md1za8fc.ad001.siemens.net> In-Reply-To: <8004cf446a3ff547ffd68ef8d3e34a6b88a17a06.camel@denx.de> References: <20181213141802.6fe4a015@md1za8fc.ad001.siemens.net> <8004cf446a3ff547ffd68ef8d3e34a6b88a17a06.camel@denx.de> X-Mailer: Claws Mail 3.15.0-dirty (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: rE0Qwoqi58BY Hi, i am testing this right now and do not assume to find more. But i would suggest a PV bump, i.e. 0.2. Henning Am Wed, 19 Dec 2018 12:43:43 +0100 schrieb Harald Seiler : > Currently, when sshd-regen-keys runs dpkg-reconfigure, this > will lead to a call to `systemctl restart ssh`. This call blocks > forever because of course the sshd-regen-keys unit, which is a > dependency of sshd, hasn't finished at this point and can't do so > because it is waiting as well. > > To circumvent this deadlock, this commit changes sshd-regen-keys' > behavior so sshd is first disabled and only reenabled after the > job is done. > > Signed-off-by: Harald Seiler > --- > > That is what i guessed. But can we not drop that? The unit has to > > finish before sshd anyways, so there will be a "start sshd" > > somewhere after that point. > > I am not certain, however I tested it and it looks like you are right. > > Changes for v2: > - Remove `systemctl start --no-block ssh` call as it looks like > this is not needed. > > .../sshd-regen-keys/files/sshd-regen-keys.service | 2 +- > .../sshd-regen-keys/files/sshd-regen-keys.sh | 18 > ++++++++++++++++++ .../sshd-regen-keys/sshd-regen-keys_0.1.bb > | 7 +++++-- 3 files changed, 24 insertions(+), 3 deletions(-) > create mode 100644 > meta/recipes-support/sshd-regen-keys/files/sshd-regen-keys.sh > > diff --git > a/meta/recipes-support/sshd-regen-keys/files/sshd-regen-keys.service > b/meta/recipes-support/sshd-regen-keys/files/sshd-regen-keys.service > index 3b8231f..a05e1a9 100644 --- > a/meta/recipes-support/sshd-regen-keys/files/sshd-regen-keys.service > +++ > b/meta/recipes-support/sshd-regen-keys/files/sshd-regen-keys.service > @@ -10,7 +10,7 @@ ConditionPathIsReadWrite=/etc Type=oneshot > RemainAfterExit=yes Environment=DEBIAN_FRONTEND=noninteractive > -ExecStart=/bin/sh -c "rm -v /etc/ssh/ssh_host_*_key*; > dpkg-reconfigure openssh-server" > +ExecStart=/usr/sbin/sshd-regen-keys.sh ExecStartPost=-/bin/systemctl > disable sshd-regen-keys.service StandardOutput=syslog > StandardError=syslog diff --git > a/meta/recipes-support/sshd-regen-keys/files/sshd-regen-keys.sh > b/meta/recipes-support/sshd-regen-keys/files/sshd-regen-keys.sh new > file mode 100644 index 0000000..11fca3b --- /dev/null > +++ b/meta/recipes-support/sshd-regen-keys/files/sshd-regen-keys.sh > @@ -0,0 +1,18 @@ > +#!/usr/bin/env sh > + > +echo -n "SSH server is " > +if systemctl is-enabled ssh; then > + SSHD_ENABLED="true" > + systemctl disable --no-reload ssh > +fi > + > +echo "Removing keys ..." > +rm -v /etc/ssh/ssh_host_*_key* > + > +echo "Regenerating keys ..." > +dpkg-reconfigure openssh-server > + > +if test -n $SSHD_ENABLED; then > + echo "Reenabling ssh server ..." > + systemctl enable --no-reload ssh > +fi > diff --git > a/meta/recipes-support/sshd-regen-keys/sshd-regen-keys_0.1.bb > b/meta/recipes-support/sshd-regen-keys/sshd-regen-keys_0.1.bb index > 02e9e25..6f12414 100644 --- > a/meta/recipes-support/sshd-regen-keys/sshd-regen-keys_0.1.bb +++ > b/meta/recipes-support/sshd-regen-keys/sshd-regen-keys_0.1.bb @@ -6,9 > +6,12 @@ MAINTAINER = "isar-users " > DEBIAN_DEPENDS = "openssh-server, systemd" SRC_URI = "file://postinst > \ > - file://sshd-regen-keys.service" > + file://sshd-regen-keys.service \ > + file://sshd-regen-keys.sh" > > +do_install[cleandirs] = "${D}/lib/systemd/system \ > + ${D}/usr/sbin" > do_install() { > - install -v -d -m 755 "${D}/lib/systemd/system" > install -v -m 644 "${WORKDIR}/sshd-regen-keys.service" > "${D}/lib/systemd/system/sshd-regen-keys.service" > + install -v -m 755 "${WORKDIR}/sshd-regen-keys.sh" > "${D}/usr/sbin/sshd-regen-keys.sh" } >