From patchwork Wed Nov 28 04:20:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Mendoza-Jonas X-Patchwork-Id: 1004178 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 434SBt5f68z9s1c for ; Wed, 28 Nov 2018 15:21:10 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=mendozajonas.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=mendozajonas.com header.i=@mendozajonas.com header.b="JR4e+MKE"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="kSQGqBSQ"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 434SBt3yq2zDqhH for ; Wed, 28 Nov 2018 15:21:10 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=mendozajonas.com Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=mendozajonas.com header.i=@mendozajonas.com header.b="JR4e+MKE"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="kSQGqBSQ"; dkim-atps=neutral X-Original-To: petitboot@lists.ozlabs.org Delivered-To: petitboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=mendozajonas.com (client-ip=66.111.4.28; helo=out4-smtp.messagingengine.com; envelope-from=sam@mendozajonas.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=mendozajonas.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=mendozajonas.com header.i=@mendozajonas.com header.b="JR4e+MKE"; dkim=pass (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="kSQGqBSQ"; dkim-atps=neutral Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 434SB72r3zzDqfV for ; Wed, 28 Nov 2018 15:20:30 +1100 (AEDT) Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id 680262297C; Tue, 27 Nov 2018 23:20:26 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Tue, 27 Nov 2018 23:20:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= mendozajonas.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; s=fm1; bh=o59YH22o+gF0PjrNrkLU5zXONLahQ8g1r2AI30e58R8=; b=JR4e+ MKEerPobbC7CeQ2nNK+eFAhXCz04PnzrD6OTNEqPlHqSFoAXQzLZ1xnT6f2SnF1D caDlOi49dzveeRgvkO4i9rd3SIgjJMbZ8Yxst9WHVkJ9iH+LEIh51Wz4uV+97WHH Antn98xD4LW8spJTbmbGl3FGIszhxLkxWp5sKcBLVJgWrpSnAbwj6Xsp2UBxX35j oLPPLX2yuVcMZtqzhpwnn+JP9fbcfudPb3oBH4KFVivx/BH4a+FnGUDhGdQgzyIt MrIQ7wNB33Ww3kukfLMuzR78y4VZYTrKcZRg3NVLp+STkNdraEykhwla/h3zjvc+ rxaj+t52mXMn/nfaQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=o59YH22o+gF0PjrNrkLU5zXONLahQ8g1r2AI30e58R8=; b=kSQGqBSQ AhWsqT4mkES9zvqH7DZUtePWUUZnQ6mqX9EeO2hk0JV740UrS1M4lmzwy2aQ2uPD TD56Ik5iISWMsKwVRIRFMBr8u+0kznQ6PAe4e62Oc7Z+xerdPzZSUHEbQXYtfJEz RoJuYlLG5g8LgDXfAdgu6ArmzcUQtae8sBnOU6s14byVMddziYYO1hGSKetcOmkX A1AHzFT6T+7T2gEdq3FWlCuFIRg73qu/D34MqepZbfPvhmj38tGB4g0TE5OAV9ca JICXk/T9pc5rOTLaEFihXjtEUYniNEyTwhjp7LWtE/tdNTkzn2FysT2ID1f2pH7r Wgyik54cntlBlg== X-ME-Sender: X-ME-Proxy: Received: from v4.ozlabs.ibm.com (unknown [122.99.82.10]) by mail.messagingengine.com (Postfix) with ESMTPA id 0733810310; Tue, 27 Nov 2018 23:20:24 -0500 (EST) From: Samuel Mendoza-Jonas To: petitboot@lists.ozlabs.org Subject: [PATCH v2 01/13] utils/pb-console: Support agetty's autologin option Date: Wed, 28 Nov 2018 15:20:00 +1100 Message-Id: <20181128042012.25916-2-sam@mendozajonas.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181128042012.25916-1-sam@mendozajonas.com> References: <20181128042012.25916-1-sam@mendozajonas.com> MIME-Version: 1.0 X-BeenThere: petitboot@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Petitboot bootloader development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Samuel Mendoza-Jonas Errors-To: petitboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Petitboot" If the getty arguments include '-a' do not set the '-l' option. This implies the environment has been configured with users and will launch the subsequent pb-console instance itself. Signed-off-by: Samuel Mendoza-Jonas --- utils/pb-console | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/utils/pb-console b/utils/pb-console index 282fca11..ef9ed0f6 100644 --- a/utils/pb-console +++ b/utils/pb-console @@ -80,12 +80,24 @@ then then getty="$getty_arg" fi + + login_arg="-l$0" + for ttyarg in "$@" + do + # If the getty args include autologin don't override with -l + # and leave calling petitboot-nc to the user's init + if [ "$ttyarg" == "-a" ] + then + login_arg="" + fi + done + if [ "$detach" = 1 ] then - $getty -l $0 "$@" & + $getty $login_arg "$@" & exit else - exec $getty -l $0 "$@" + exec $getty $login_arg "$@" fi fi