From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A5EEA158094 for ; Sun, 18 Sep 2022 03:22:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5BA68E07FE; Sun, 18 Sep 2022 03:22:37 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3E6B8E07FE for ; Sun, 18 Sep 2022 03:22:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2DB2D340E78 for ; Sun, 18 Sep 2022 03:22:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6C9235B1 for ; Sun, 18 Sep 2022 03:22:34 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1663471261.63accc51997bc0433f2ce3c9f637a656eac649e7.floppym@gentoo> Subject: [gentoo-commits] proj/baselayout:master commit in: / X-VCS-Repository: proj/baselayout X-VCS-Files: Makefile X-VCS-Directories: / X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 63accc51997bc0433f2ce3c9f637a656eac649e7 X-VCS-Branch: master Date: Sun, 18 Sep 2022 03:22:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f91b3716-201c-4eca-9f1a-cd30096eec2c X-Archives-Hash: 0672cbc0aab5463d69801176587c3bf4 commit: 63accc51997bc0433f2ce3c9f637a656eac649e7 Author: Paymon gmail com> AuthorDate: Mon Jul 18 14:37:16 2022 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sun Sep 18 03:21:01 2022 +0000 URL: https://gitweb.gentoo.org/proj/baselayout.git/commit/?id=63accc51 Relax checks on KEEPDIR when directories are mounted fs My use case for this is in containers (mkosi with systemd-nspawn in my case) Closes: https://github.com/gentoo/baselayout/pull/2 Signed-off-by: Paymon gmail.com> Signed-off-by: Mike Gilbert gentoo.org> Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e0266d2a..230acbc5 100644 --- a/Makefile +++ b/Makefile @@ -76,7 +76,7 @@ layout-dirs: # Create base filesytem layout for x in $(KEEP_DIRS) ; do \ test -e $(DESTDIR)$$x/.keep && continue ; \ - $(INSTALL_DIR) $(DESTDIR)$$x || exit $$? ; \ + $(INSTALL_DIR) $(DESTDIR)$$x ; \ touch $(DESTDIR)$$x/.keep || echo "ignoring touch failure; mounted fs?" ; \ done