From patchwork Thu Jun 11 09:14:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Norbert Lange X-Patchwork-Id: 1307389 X-Patchwork-Delegate: thomas.petazzoni@free-electrons.com Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=huIysjML; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49jJ8q5zLyz9sRN for ; Thu, 11 Jun 2020 19:14:51 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 7CD228946A; Thu, 11 Jun 2020 09:14:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ogNyOuob5JcS; Thu, 11 Jun 2020 09:14:48 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id B128F8952C; Thu, 11 Jun 2020 09:14:48 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 789F71BF869 for ; Thu, 11 Jun 2020 09:14:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 73395886BD for ; Thu, 11 Jun 2020 09:14:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gDKY6r0rku1f for ; Thu, 11 Jun 2020 09:14:43 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ed1-f67.google.com (mail-ed1-f67.google.com [209.85.208.67]) by whitealder.osuosl.org (Postfix) with ESMTPS id B80FF885C7 for ; Thu, 11 Jun 2020 09:14:42 +0000 (UTC) Received: by mail-ed1-f67.google.com with SMTP id x93so3398445ede.9 for ; Thu, 11 Jun 2020 02:14:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Q9aR3zb40AIhWJUVX338OKnDy2wvyU5F5gJ6RUh/rY8=; b=huIysjMLjCCpKD1e5TacasDZnwT3fPYyojqXlDVyyDWkJ8s6hf43YzgV/ZSgsKfuDd 3EoItJ/OwFYRSAVqz7ahQRRrbkt0UxSb19PqPCYsUSpwz9MXRRjbj92zwxuXGa061IJ+ BERblc/CNTLSdMbZW5vWUL9RaApC/YQq3fs2iFB1jQBw2eWahJ9lcZ9esm6zKwNzH2il MiRe7fPzh3WnyZ3iievNTtkcguhlwOmZsGhoujLxDE5V9Jp1QzJ/qeXqfDikxNKuG08J rJCH832L6yF60NQTlds4ndaUhHvI4lks/83Vx9a86ewZm1So6tBEHto4L6jIoaR3osCm RbkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Q9aR3zb40AIhWJUVX338OKnDy2wvyU5F5gJ6RUh/rY8=; b=pHC+nMXGEjmaX0+bQ5qRMv/6+sKquXK9x3LIrXJDONX6PmVBMAPXfDdiIXAzdzTnG+ L0GBa0ws2R8dxZFRqYcNkmHHmhUqTfJqRt5b3Cgg4TaKpEg2bDVJS7tCS2SzAta+Jv2K g40pci22lpSpmwnRCGOJHma+Wfr/GZbrfauiKPQPXDg1nenUbWPmP2pyvAPYWOsO77nE qE/5/5/IabWhlg7KUH9QFL41+jndXtd6idLULZOSYkoEsRwR8oPgzI/13uGZDdYXirO2 1iAI0yAuBhQ8aZJGOSyW8sBLq9W6G87vmTizHRWwSl7InW2eum7YFCi9cEIkgAjVZSTT /Hqw== X-Gm-Message-State: AOAM532B3FoLbzWskNXu8W/NkYfTP/DCYQTzIl/vUD/Nx8bRD2ix40/V KM4ac0s6oeyG1OF88bgLfvc5eKZS3zE= X-Google-Smtp-Source: ABdhPJyEYbusk0WHX6EwbLxjoDyvXRP4Uimf2L8X3ookmQsfzMgBbS5zX5CxW8uPQqnAEC2EBRhIVQ== X-Received: by 2002:a50:f297:: with SMTP id f23mr6001075edm.222.1591866880884; Thu, 11 Jun 2020 02:14:40 -0700 (PDT) Received: from localhost.localdomain (84-114-45-16.cable.dynamic.surfer.at. [84.114.45.16]) by smtp.gmail.com with ESMTPSA id ck11sm1541678ejb.41.2020.06.11.02.14.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jun 2020 02:14:40 -0700 (PDT) From: Norbert Lange To: buildroot@buildroot.org Date: Thu, 11 Jun 2020 11:14:06 +0200 Message-Id: <20200611091407.12688-4-nolange79@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200611091407.12688-1-nolange79@gmail.com> References: <20200611091407.12688-1-nolange79@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 3/3] package/openssh: add sd socket-activated ssh daemon services X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Norbert Lange , jeremy.rosen@smile.fr Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Norbert Lange --- package/openssh/openssh.mk | 6 +++--- package/openssh/sshd-host-keygen.service | 2 +- package/openssh/sshd.socket | 11 +++++++++++ package/openssh/sshd@.service | 10 ++++++++++ 4 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 package/openssh/sshd.socket create mode 100644 package/openssh/sshd@.service diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index 1fcd957299..cbfe8f6f7d 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -116,9 +116,9 @@ endef OPENSSH_POST_INSTALL_TARGET_HOOKS += OPENSSH_INSTALL_SERVER_PROGRAMS define OPENSSH_INSTALL_INIT_SYSTEMD - mkdir $(TARGET_DIR)/usr/lib/systemd/system - $(INSTALL) -m 644 package/openssh/sshd*.service \ - $(TARGET_DIR)/usr/lib/systemd/system/ + mkdir -p $(TARGET_DIR)/usr/lib/systemd/system + $(INSTALL) -m 644 package/openssh/sshd*.service package/openssh/sshd.socket \ + $(TARGET_DIR)/usr/lib/systemd/system/. $(OPENSSH_INSTALL_SYSTEMD_SYSUSERS) endef diff --git a/package/openssh/sshd-host-keygen.service b/package/openssh/sshd-host-keygen.service index 2db1be16c4..0e071c9d8c 100644 --- a/package/openssh/sshd-host-keygen.service +++ b/package/openssh/sshd-host-keygen.service @@ -20,4 +20,4 @@ Type=oneshot RemainAfterExit=yes [Install] -WantedBy=sshd.service +WantedBy=sshd.service sshd.socket diff --git a/package/openssh/sshd.socket b/package/openssh/sshd.socket new file mode 100644 index 0000000000..bbae9ed7aa --- /dev/null +++ b/package/openssh/sshd.socket @@ -0,0 +1,11 @@ +[Unit] +Description=OpenBSD Secure Shell server socket +Before=sshd.service +Conflicts=sshd.service + +[Socket] +ListenStream=22 +Accept=yes + +[Install] +WantedBy=sockets.target diff --git a/package/openssh/sshd@.service b/package/openssh/sshd@.service new file mode 100644 index 0000000000..b3a590d9a3 --- /dev/null +++ b/package/openssh/sshd@.service @@ -0,0 +1,10 @@ +[Unit] +Description=OpenBSD Secure Shell server per-connection daemon +Documentation=man:sshd(8) man:sshd_config(5) +After=auditd.service + +[Service] +ExecStart=-/usr/sbin/sshd -i +StandardInput=socket +RuntimeDirectory=sshd +RuntimeDirectoryMode=0755