From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A4C14138334 for ; Thu, 18 Jul 2019 17:32:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CBA37E081A; Thu, 18 Jul 2019 17:32:24 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B2356E081A for ; Thu, 18 Jul 2019 17:32:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 70CCD347FD6 for ; Thu, 18 Jul 2019 17:32:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 34282703 for ; Thu, 18 Jul 2019 17:32:21 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1563470814.6c6b3d9b7294a171a7c01ac981fee95cb0e3a94c.whissi@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: defaults/ X-VCS-Repository: proj/genkernel X-VCS-Files: defaults/initrd.scripts X-VCS-Directories: defaults/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 6c6b3d9b7294a171a7c01ac981fee95cb0e3a94c X-VCS-Branch: master Date: Thu, 18 Jul 2019 17:32:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 77dddd1c-f2d2-4e07-9187-314f3df49b90 X-Archives-Hash: 4a0002d7cc40fc8bc1b23678b2e422eb commit: 6c6b3d9b7294a171a7c01ac981fee95cb0e3a94c Author: Thomas Deutschmann gentoo org> AuthorDate: Thu Jul 18 17:26:54 2019 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Jul 18 17:26:54 2019 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=6c6b3d9b initrd.scripts: start_sshd(): Don't start sshd when network wasn't started Signed-off-by: Thomas Deutschmann gentoo.org> defaults/initrd.scripts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index cdd5a2e..bc19fff 100644 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -1829,6 +1829,12 @@ start_sshd() { return fi + if [ ! -f "${GK_NET_LOCKFILE}" ] + then + warn_msg "Network not started; Not starting sshd ..." + return + fi + if [ ! -x "/usr/sbin/dropbear" ] then bad_msg "/usr/sbin/dropbear not found! Did you call genkernel with --ssh parameter?"