From patchwork Tue Mar 29 00:39:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 602699 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 3qYsPS52mgz9sBM for ; Tue, 29 Mar 2016 11:40:12 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=zacarias.com.ar header.i=@zacarias.com.ar header.b=Ts8VE3MN; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E134831E8B; Tue, 29 Mar 2016 00:40:11 +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 70yPzpvXqUYG; Tue, 29 Mar 2016 00:40:09 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id E16FD31E53; Tue, 29 Mar 2016 00:40:08 +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 027C91CF225 for ; Tue, 29 Mar 2016 00:40:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id F095D8B8BD for ; Tue, 29 Mar 2016 00:40:06 +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 NAR2OkE1l8pa for ; Tue, 29 Mar 2016 00:40:05 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from www.zacarias.com.ar (www.zacarias.com.ar [176.9.42.171]) by whitealder.osuosl.org (Postfix) with ESMTPS id 3A74B8B834 for ; Tue, 29 Mar 2016 00:40:04 +0000 (UTC) Received: from asgard (cpe-186-22-138-122.telecentro-reversos.com.ar [186.22.138.122] (may be forged)) (authenticated bits=0) by www.zacarias.com.ar (8.15.1/8.15.1) with ESMTPSA id u2T0dvCh006702 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 29 Mar 2016 00:40:00 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1459212002; bh=391RBmjB2TYKq0w5uZ1Nn/XmfBPOvSKZEzyNgDGUvcI=; h=From:To:Cc:Subject:Date; b=Ts8VE3MN7OR0FzoQXCR3fAWPrAGO4G9/fZMWJZ4kgTaAew+aI/Ooaz1hWe5b0x8Gv 1gHwwsIyUj44ge5aoHxVcD1i7u/wIAhFmUIXTtCOFsgaa4F8OE3n36TJdQ2FoStArE p+n9oR9lXfjzHSp9/VE+p9V/5tWJfWLSI7AROc+w= Received: by asgard (sSMTP sendmail emulation); Mon, 28 Mar 2016 21:39:56 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Mon, 28 Mar 2016 21:39:56 -0300 Message-Id: <1459211996-30192-1-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 2.7.3 X-Virus-Scanned: clamav-milter 0.98.7 at www X-Virus-Status: Clean Subject: [Buildroot] [PATCH] linux-pam: install login.pam from here X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Instead of installing login.pam (/etc/pam.d/login) from util-linux conditionally do so unconditionally from linux-pam. If busybox login is pam-enabled (linux-pam package enabled) it will be required, otherwise it will lead to a system where login won't work, and if util-linux is enabled it will supercede busybox login and will be necesarry regardless. Signed-off-by: Gustavo Zacarias --- package/linux-pam/linux-pam.mk | 4 +++- package/{util-linux => linux-pam}/login.pam | 0 package/util-linux/util-linux.mk | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) rename package/{util-linux => linux-pam}/login.pam (100%) diff --git a/package/linux-pam/linux-pam.mk b/package/linux-pam/linux-pam.mk index cf1b5b7..71c5490 100644 --- a/package/linux-pam/linux-pam.mk +++ b/package/linux-pam/linux-pam.mk @@ -26,8 +26,10 @@ LINUX_PAM_DEPENDENCIES += gettext LINUX_PAM_MAKE_OPTS += LIBS=-lintl endif -# Install default pam config (deny everything) +# Install default pam config (deny everything except login) define LINUX_PAM_INSTALL_CONFIG + $(INSTALL) -m 0644 -D package/linux-pam/login.pam \ + $(TARGET_DIR)/etc/pam.d/login $(INSTALL) -m 0644 -D package/linux-pam/other.pam \ $(TARGET_DIR)/etc/pam.d/other endef diff --git a/package/util-linux/login.pam b/package/linux-pam/login.pam similarity index 100% rename from package/util-linux/login.pam rename to package/linux-pam/login.pam diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 141dffd..a055d17 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -153,8 +153,6 @@ endif # Install PAM configuration files ifeq ($(BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS),y) define UTIL_LINUX_INSTALL_PAMFILES - $(INSTALL) -m 0644 package/util-linux/login.pam \ - $(TARGET_DIR)/etc/pam.d/login $(INSTALL) -m 0644 package/util-linux/su.pam \ $(TARGET_DIR)/etc/pam.d/su $(INSTALL) -m 0644 package/util-linux/su.pam \