From patchwork Sun Mar 1 15:17:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 1247328 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.137; helo=fraxinus.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=hzsOI+/o; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48Vn320Skxz9sSH for ; Mon, 2 Mar 2020 02:18:05 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id C5FA18502B; Sun, 1 Mar 2020 15:18:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9TXUcWNED-Gy; Sun, 1 Mar 2020 15:18:02 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7A4D684F24; Sun, 1 Mar 2020 15:18:02 +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 42C601BF2E3 for ; Sun, 1 Mar 2020 15:18:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 3AFC186061 for ; Sun, 1 Mar 2020 15:18:01 +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 vuzUOewAv2aE for ; Sun, 1 Mar 2020 15:17:58 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qt1-f169.google.com (mail-qt1-f169.google.com [209.85.160.169]) by whitealder.osuosl.org (Postfix) with ESMTPS id 9D13B86096 for ; Sun, 1 Mar 2020 15:17:58 +0000 (UTC) Received: by mail-qt1-f169.google.com with SMTP id j34so5694430qtk.4 for ; Sun, 01 Mar 2020 07:17:58 -0800 (PST) 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; bh=9GBXAxTh1475ZSHUTg3gCMMGZe0Xsfb+hmBgGw4nqm0=; b=hzsOI+/ohCiuszZkkGLnRea21gLOPhfkjwPdQ5zuwR9KEn8VYtSorcRN5aC8twd3Vk fvLQ41eWG9suICVdRoqBmdRJg2y50uFo021ic4Oeilp5qKOPL/EZ0frtWBxHBr4Ear68 7LS0reFRjTjxjOhjychRpM3lclZt9coPrF34SN9s6sypC6LyA21Vm2zznMXPDJkWfGN3 gbNQNHH8WtenNvbcDqmuq2FQzniAJASP0qOmIav0RrgXa7WXSL2ND1QUBFNBEJC942lE h3USt6TByHFEuA6UbzkVrhYerjtz6+EnoUtGkuiz471TlanwI7VK7Eu+4KSHYDB9ViDF TEiQ== 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; bh=9GBXAxTh1475ZSHUTg3gCMMGZe0Xsfb+hmBgGw4nqm0=; b=c/I4s8W9qEXZSOa38FyTbn/OZJs9hPSpgRG7GX+PJzv7MDnm/JXHMM5xbg3/7c/C1V rPu+sUOCw66FEUj5ZKu4G6iMFJ2O8O34Dkn99DeKKIV/IEAxvobD0PnaOB/fKvOvwZMa /hthuZM7oqkQg0KwJdVqAVhJ2HWUNZ1FcKJpmZ+YtpnhgyiK7S/OucKDezgnocXpD9cm sxB1VMAPpgKEceLjw1ajxMjBIlwCl2GS3X5prWMzRk63mLDT55ftqyyaHh/k8ntmTVkY wxv6+VTxRk6/Q7zLP3IjRwL4z7jE5DMa9wsJJpdcM9jeGD3SBroL95GhIusKukmrGOU1 9Epw== X-Gm-Message-State: APjAAAVZ7zyHpNPsdm6Lp88S6Tpnq+78nUtrse9GiQSCvgk05qeRp2qF c8dZpE7BozvyCQ+0E2EBNSAmlaFr X-Google-Smtp-Source: APXvYqyg5/D8KPCg0nkG0zm/rJXNH6huOMaNuh9ubi+zk7tJfAWOYdcztvcG8HIClN7WjLJs+zzMRA== X-Received: by 2002:ac8:7101:: with SMTP id z1mr11430587qto.333.1583075877202; Sun, 01 Mar 2020 07:17:57 -0800 (PST) Received: from casantos.remote.com (200.175.82.32.dynamic.adsl.gvt.net.br. [200.175.82.32]) by smtp.gmail.com with ESMTPSA id t37sm8866302qth.0.2020.03.01.07.17.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Mar 2020 07:17:56 -0800 (PST) From: unixmania@gmail.com To: buildroot@buildroot.org Date: Sun, 1 Mar 2020 12:17:44 -0300 Message-Id: <20200301151747.25723-2-unixmania@gmail.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200301151747.25723-1-unixmania@gmail.com> References: <20200301151747.25723-1-unixmania@gmail.com> Subject: [Buildroot] [PATCH/next v2 1/4] package/openrc: drop custom getty service 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: Carlos Santos , Adam Duskett , =?utf-8?b?TWljaGHFgiDFgXlzemN6ZWs=?= MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Carlos Santos In Buildroot getty is provided by BusyBox or util-linux (agetty). Both create a /sbin/getty symlink pointing to the actual program, so make the agetty service use that path instead of /sbin/agetty. Also start agetty after all other services, to prevent mixing startup messages with the getty prompt on devices with a single serial console. This allows us to drop the custom getty service, which causes an error message from openrc 0.42.1 (in a forthcoming patch): Error: getty is the name of a real and virtual service. The patches are required because it's not possible to override the command or startup order by means of a configuration file. Anyway it's still better to patch something maintained upstream than depending on a custom piece that may easily become obsolete. Signed-off-by: Carlos Santos --- CC: Adam Duskett --- ...ty-replace-sbin-agetty-by-sbin-getty.patch | 33 +++++++++++++++++++ ...getty-start-agetty-after-all-sevices.patch | 29 ++++++++++++++++ package/openrc/getty | 24 -------------- package/openrc/openrc.mk | 8 ++--- 4 files changed, 65 insertions(+), 29 deletions(-) create mode 100644 package/openrc/0003-init.d-agetty-replace-sbin-agetty-by-sbin-getty.patch create mode 100644 package/openrc/0004-init.d-agetty-start-agetty-after-all-sevices.patch delete mode 100755 package/openrc/getty diff --git a/package/openrc/0003-init.d-agetty-replace-sbin-agetty-by-sbin-getty.patch b/package/openrc/0003-init.d-agetty-replace-sbin-agetty-by-sbin-getty.patch new file mode 100644 index 0000000000..feeff22254 --- /dev/null +++ b/package/openrc/0003-init.d-agetty-replace-sbin-agetty-by-sbin-getty.patch @@ -0,0 +1,33 @@ +From b39ab180358ed451eae9df900f49a72ef1eb7442 Mon Sep 17 00:00:00 2001 +From: Carlos Santos +Date: Sun, 1 Mar 2020 09:04:48 -0300 +Subject: [PATCH] init.d/agetty: replace /sbin/agetty by /sbin/getty + +In Buildroot getty is provided by BusyBox or util-linux (agetty). Both +create a /sbin/getty symlink pointing to the actual program, so make the +agetty service use that path instead of /sbin/agetty. + +The patch is required because it's not possible to override the command +by means of a configuration file. + +Signed-off-by: Carlos Santos +--- + init.d/agetty.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/init.d/agetty.in b/init.d/agetty.in +index e4866f7a..e1864628 100644 +--- a/init.d/agetty.in ++++ b/init.d/agetty.in +@@ -14,7 +14,7 @@ supervisor=supervise-daemon + port="${RC_SVCNAME#*.}" + respawn_period="${respawn_period:-60}" + term_type="${term_type:-linux}" +-command=/sbin/agetty ++command=/sbin/getty + command_args_foreground="${agetty_options} ${port} ${baud} ${term_type}" + pidfile="/run/${RC_SVCNAME}.pid" + +-- +2.18.2 + diff --git a/package/openrc/0004-init.d-agetty-start-agetty-after-all-sevices.patch b/package/openrc/0004-init.d-agetty-start-agetty-after-all-sevices.patch new file mode 100644 index 0000000000..f1c927a450 --- /dev/null +++ b/package/openrc/0004-init.d-agetty-start-agetty-after-all-sevices.patch @@ -0,0 +1,29 @@ +From c2dc04f6b8c6784941b896e0b17c160dd43a566f Mon Sep 17 00:00:00 2001 +From: Carlos Santos +Date: Sun, 1 Mar 2020 11:14:37 -0300 +Subject: [PATCH] init.d/agetty: start agetty after all services + +This is required for Buildroot, to prevent mixing service initialization +messages with the getty prompt on devices with a single serial console. + +Signed-off-by: Carlos Santos +--- + init.d/agetty.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/init.d/agetty.in b/init.d/agetty.in +index e1864628..a1ad4e9f 100644 +--- a/init.d/agetty.in ++++ b/init.d/agetty.in +@@ -19,7 +19,7 @@ command_args_foreground="${agetty_options} ${port} ${baud} ${term_type}" + pidfile="/run/${RC_SVCNAME}.pid" + + depend() { +- after local ++ after * + keyword -prefix + provide getty + } +-- +2.18.2 + diff --git a/package/openrc/getty b/package/openrc/getty deleted file mode 100755 index 8fcb071f8a..0000000000 --- a/package/openrc/getty +++ /dev/null @@ -1,24 +0,0 @@ -#!/sbin/openrc-run -# based on agetty service from OpenRC package - -description="start getty on terminal" -supervisor=supervise-daemon -port="${RC_SVCNAME#*.}" -term_type="${term_type:-linux}" -command=/sbin/getty -command_args_foreground="${getty_options} ${baud} ${port} ${term_type}" -pidfile="/run/${RC_SVCNAME}.pid" - -depend() { - # start getty at the very end of init - after * - keyword -prefix -} - -start_pre() { - export EINFO_QUIET="${quiet:-yes}" -} - -stop_pre() { - export EINFO_QUIET="${quiet:-yes}" -} diff --git a/package/openrc/openrc.mk b/package/openrc/openrc.mk index 1f8516f5ee..ce0b05e965 100644 --- a/package/openrc/openrc.mk +++ b/package/openrc/openrc.mk @@ -68,17 +68,15 @@ endef OPENRC_TARGET_FINALIZE_HOOKS += OPENRC_REMOVE_UNNEEDED ifeq ($(BR2_TARGET_GENERIC_GETTY),y) -OPENRC_GETTY_SVCNAME = getty.$(SYSTEM_GETTY_PORT) +OPENRC_GETTY_SVCNAME = agetty.$(SYSTEM_GETTY_PORT) OPENRC_GETTY_CONF_D = $(TARGET_DIR)/etc/conf.d/$(OPENRC_GETTY_SVCNAME) define OPENRC_SET_GETTY { \ echo "baud=\"$(SYSTEM_GETTY_BAUDRATE)\""; \ echo "term_type=\"$(SYSTEM_GETTY_TERM)\"" ; \ - echo "getty_options=\"-L $(SYSTEM_GETTY_OPTIONS)\""; \ + echo "agetty_options=\"-L $(SYSTEM_GETTY_OPTIONS)\""; \ } > $(OPENRC_GETTY_CONF_D) - $(INSTALL) -D -m 0755 $(OPENRC_PKGDIR)/getty \ - $(TARGET_DIR)/etc/init.d/getty - ln -sf getty $(TARGET_DIR)/etc/init.d/$(OPENRC_GETTY_SVCNAME) + ln -sf agetty $(TARGET_DIR)/etc/init.d/$(OPENRC_GETTY_SVCNAME) ln -sf /etc/init.d/$(OPENRC_GETTY_SVCNAME) \ $(TARGET_DIR)/etc/runlevels/default/$(OPENRC_GETTY_SVCNAME) endef