From patchwork Fri Apr 17 12:08:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ivo Slanina X-Patchwork-Id: 462031 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id BD7041402E1 for ; Fri, 17 Apr 2015 22:09:21 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=Vgk/WO0L; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id C38F6840C7; Fri, 17 Apr 2015 12:09:20 +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 q2mWmkbBM_Vn; Fri, 17 Apr 2015 12:09:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 12CDF842E4; Fri, 17 Apr 2015 12:09:20 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id A28391C21BA for ; Fri, 17 Apr 2015 12:09:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9EE45842E4 for ; Fri, 17 Apr 2015 12:09:18 +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 LrEAku0pkbMY for ; Fri, 17 Apr 2015 12:09:18 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f175.google.com (mail-wi0-f175.google.com [209.85.212.175]) by fraxinus.osuosl.org (Postfix) with ESMTPS id DA6C2840C7 for ; Fri, 17 Apr 2015 12:09:17 +0000 (UTC) Received: by wiax7 with SMTP id x7so32547762wia.0 for ; Fri, 17 Apr 2015 05:09:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=QOVnGkULvul+DnSPZ9kmhQJz89Td3t/dGudGFqsjRhU=; b=Vgk/WO0LPr0UMoSRbtYcWB4vm7LHn4gQCOXPZ/vKAdX1JyoI775+j5tIncdWSmYOdD 1Yvb5oW67jUs9KCZbGIsTMqtFwSp7JrjbE3aywXg+UDIy+lf6NxeT3F3VtHkpd4ls4/S /c8oH37uM+KSGWKQ1SpyITPA7SXhwP/6RDZXM28JTnOUBht7LQ9DL+H/aEe68sMEZlbo h6Sq/YR4shKPZgP4KofxPGtYpejZvdYNSOL+8pihgNw2kpI5b+Xbgef3fhncPNY+gFqJ jc9F01S9qpph3Ut4eVtGYhucXA45K7t/Ekn/2wZwqUwSiTAnXkNyTXL0u+Xl6aJWDIgi ZNtw== X-Received: by 10.194.89.7 with SMTP id bk7mr5160136wjb.127.1429272556547; Fri, 17 Apr 2015 05:09:16 -0700 (PDT) Received: from localhost.localdomain (105.209.broadband18.iol.cz. [109.81.209.105]) by mx.google.com with ESMTPSA id e2sm14383030wjy.46.2015.04.17.05.09.13 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 17 Apr 2015 05:09:15 -0700 (PDT) From: Ivo Slanina To: buildroot@buildroot.org Date: Fri, 17 Apr 2015 14:08:57 +0200 Message-Id: <1429272537-20122-1-git-send-email-ivo.slanina@gmail.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/systemd: fix /usr/lib/tmpfiles.d/etc.conf 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: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Current systemd version (219) has bug in tmpfiles.d/etc.conf.m4 file. Bug causes adding line C /etc/pam.d - - - - into /usr/lib/tmpfiles.d/etc.conf, regardless of wheter systemd is configured with --disable-pam option or not. Since systemd is always compiled with this option, that line causes fauilure in systemd systemd-tmpfiles-setup.service unit during boot. Failure is caused becase systemd is trying to copy directory /usr/share/factory/etc/pam.d/ into /etc, which doesn't exist. This patch adds 0004-only-copy-etc-pam.d-if-pam-is-present.patch file into systemd package directory to fix downloaded source tree. This issue is also solved in systemd source, but isn't released yet. After release and appropriate package upgrade, this patch will be no more relevant and should be removed. (http://lists.freedesktop.org/archives/systemd-devel/2015-March/028937.html) Signed-off-by: Ivo Slanina --- .../0004-only-copy-etc-pam.d-if-pam-is-present.patch | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 package/systemd/0004-only-copy-etc-pam.d-if-pam-is-present.patch diff --git a/package/systemd/0004-only-copy-etc-pam.d-if-pam-is-present.patch b/package/systemd/0004-only-copy-etc-pam.d-if-pam-is-present.patch new file mode 100644 index 0000000..983b931 --- /dev/null +++ b/package/systemd/0004-only-copy-etc-pam.d-if-pam-is-present.patch @@ -0,0 +1,18 @@ +only copy /etc/pam.d if PAM is present + +This patch is taken from systemd source. +See http://lists.freedesktop.org/archives/systemd-devel/2015-March/028937.html + +Current systemd release doesnť contain patched tmpfiles.d/etc.conf.m4 +file. After releasing new systemd version and bumbing to it, this patch +should be no longer needed. + +--- systemd-219.orig/tmpfiles.d/etc.conf.m4 2015-04-17 11:37:41.451001621 +0200 ++++ systemd-219/tmpfiles.d/etc.conf.m4 2015-04-17 11:38:43.738749756 +0200 +@@ -14,4 +14,6 @@ + L /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf + )m4_dnl + C /etc/nsswitch.conf - - - - ++m4_ifdef(`HAVE_PAM', + C /etc/pam.d - - - - ++)m4_dnl