From patchwork Wed Sep 19 11:49:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: philip.a.molloy@gmail.com X-Patchwork-Id: 971578 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 (mailfrom) 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.b="T3zueC9b"; 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 42FdSc30FBz9sBv for ; Wed, 19 Sep 2018 21:49:36 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id EC024885ED; Wed, 19 Sep 2018 11:49:34 +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 JveTZN4SWPIu; Wed, 19 Sep 2018 11:49:34 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 84896885F1; Wed, 19 Sep 2018 11:49:34 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 371341C2D37 for ; Wed, 19 Sep 2018 11:49:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 349D62274A for ; Wed, 19 Sep 2018 11:49:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1OzAD70RcxdP for ; Wed, 19 Sep 2018 11:49:32 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-it0-f49.google.com (mail-it0-f49.google.com [209.85.214.49]) by silver.osuosl.org (Postfix) with ESMTPS id A52FF226B2 for ; Wed, 19 Sep 2018 11:49:32 +0000 (UTC) Received: by mail-it0-f49.google.com with SMTP id p129-v6so7288612ite.3 for ; Wed, 19 Sep 2018 04:49:32 -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; bh=1bUTcLk8hQankg+hnpPW/my+uSeygkaiAfCDy68V8Tw=; b=T3zueC9b6mX7v+fQFbI2HtcBbWgjEMMmIzyoIgXIP6NuDTDSpGvsS8dUovh2gvOX0r 8MX5szdFQcZQNKoi33py2n0miug1miDz+JuQ+AJ5yUSVQEvkWePeaQ+otQauZ92MLmm6 5LxFQtSHhJRNb+qXpydy4LJWPLH543doN0ZDNxCPH1ButTujfJL+qHjggIAe/JSh95zd Bjk4Va28lTGXZBvZUOkfkU2Py90ctELb3gd01o85B+6zJPB7o1iJ7M4qzwPeC8qb4jXm WZXf811Pd4fJnh9KGyf6RSrQGb9K4IE0rt3GzX609378KgSfgy9+1srlr5qb8NBPgq7x fxIg== 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; bh=1bUTcLk8hQankg+hnpPW/my+uSeygkaiAfCDy68V8Tw=; b=Xl5PkFJRJJb12GK6fClfJSOAbV/XwjTK7cc+u5b0bX54brFOEZt0XTz4VVXtF7B5V/ 28RG/LpYC3iovexvERVy3Gmvx2SaFVhNZmPLN+X3fDjb8hcBOY1y0TOGbu+1/Kct4lZ7 HlbW6xH3Y/DrHWulf4l+97jQD3R37qoB0Ea3m8/QH6cIyI6wylZqpl3CLSbloLzkjBTx e0uVnIo0qiWtxc5s1rA0IblY/9KQ4TiktMSE6uk7MtG+aAH4lbfUK8DJnOTKeY/6T7K4 7TLblvxV0Xym+vvEIJXhDuAndMWwl8Lq+hZzc50NuZH8jXNUQEStq+S2GJkgwd8A7t1R D1zg== X-Gm-Message-State: APzg51CYqZp7qXoQ2CveDbHxs3NgjPaLx8iqdjJSsK0CNqXRDbGxmUDq xOyKefogXobgmQOuNBPDWyloBmrE X-Google-Smtp-Source: ANB0VdaNTu57wy7Qxu6lxf1S8GOxgWYN1+l6RUzhxxSZHcVQJPm82szhYGSoVvgnJAziMlPoUUTFrg== X-Received: by 2002:a24:d786:: with SMTP id y128-v6mr20649208itg.71.1537357771385; Wed, 19 Sep 2018 04:49:31 -0700 (PDT) Received: from gorham.localdomain ([2604:6000:150f:3eb:e107:bbe2:1a0:7b97]) by smtp.gmail.com with ESMTPSA id 138-v6sm14619133ioe.20.2018.09.19.04.49.29 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 19 Sep 2018 04:49:30 -0700 (PDT) From: philip.a.molloy@gmail.com To: buildroot@buildroot.org Date: Wed, 19 Sep 2018 07:49:24 -0400 Message-Id: <20180919114924.8456-1-philip.a.molloy@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [Buildroot] [PATCH 1/1] system/Config.in: specify root shell X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Philip Molloy MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Philip Molloy Signed-off-by: Philip Molloy --- package/skeleton-init-common/skeleton-init-common.mk | 6 ++++++ system/Config.in | 10 ++++++++++ 2 files changed, 16 insertions(+) diff --git a/package/skeleton-init-common/skeleton-init-common.mk b/package/skeleton-init-common/skeleton-init-common.mk index e8a0522052..bddb614127 100644 --- a/package/skeleton-init-common/skeleton-init-common.mk +++ b/package/skeleton-init-common/skeleton-init-common.mk @@ -38,6 +38,7 @@ SKELETON_INIT_COMMON_HOSTNAME = $(call qstrip,$(BR2_TARGET_GENERIC_HOSTNAME)) SKELETON_INIT_COMMON_ISSUE = $(call qstrip,$(BR2_TARGET_GENERIC_ISSUE)) SKELETON_INIT_COMMON_ROOT_PASSWD = $(call qstrip,$(BR2_TARGET_GENERIC_ROOT_PASSWD)) SKELETON_INIT_COMMON_PASSWD_METHOD = $(call qstrip,$(BR2_TARGET_GENERIC_PASSWD_METHOD)) +SKELETON_INIT_COMMON_ROOT_SHELL = $(call qstrip,$(BR2_TARGET_GENERIC_ROOT_SHELL)) SKELETON_INIT_COMMON_BIN_SH = $(call qstrip,$(BR2_SYSTEM_BIN_SH)) ifneq ($(SKELETON_INIT_COMMON_HOSTNAME),) @@ -74,6 +75,11 @@ define SKELETON_INIT_COMMON_SET_ROOT_PASSWD endef SKELETON_INIT_COMMON_TARGET_FINALIZE_HOOKS += SKELETON_INIT_COMMON_SET_ROOT_PASSWD +define SKELETON_INIT_COMMON_SET_ROOT_SHELL +$(SED) 's,^\(root:.*:\).*,\1$(SKELETON_INIT_COMMON_ROOT_SHELL),' $(TARGET_DIR)/etc/passwd +endef +SKELETON_INIT_COMMON_TARGET_FINALIZE_HOOKS += SKELETON_INIT_COMMON_SET_ROOT_SHELL + ifeq ($(BR2_SYSTEM_BIN_SH_NONE),y) define SKELETON_INIT_COMMON_SET_BIN_SH rm -f $(TARGET_DIR)/bin/sh diff --git a/system/Config.in b/system/Config.in index f63f27b126..ec8fbe0251 100644 --- a/system/Config.in +++ b/system/Config.in @@ -407,6 +407,16 @@ config BR2_SYSTEM_DHCP comment "automatic network configuration via DHCP needs ifupdown or busybox or networkd" depends on !(BR2_PACKAGE_BUSYBOX || BR2_PACKAGE_IFUPDOWN || BR2_PACKAGE_SYSTEMD_NETWORKD) +config BR2_TARGET_GENERIC_ROOT_SHELL + string "Root shell" + default "/bin/sh" + help + Set the root login shell. + + Explicitly defining the root login shell in /etc/passwd may be required + when symlinking /bin/sh to bash because invocating bash as sh causes bash + to mimic sh (see INVOCATION in bash(1)). + endif # BR2_ROOTFS_SKELETON_DEFAULT config BR2_ENABLE_LOCALE_PURGE