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 783721581D3 for ; Mon, 20 May 2024 15:06:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8D00AE2A3C; Mon, 20 May 2024 15:06:51 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 674ABE2A3C for ; Mon, 20 May 2024 15:06:51 +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 9D5A333BDFF for ; Mon, 20 May 2024 15:06:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F32251AA0 for ; Mon, 20 May 2024 15:06:48 +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: <1716217566.c41f012f4b8aa5b7fc231a2da8a0dd8a5af72ec1.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/, sys-apps/util-linux/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/util-linux/files/uuidd.initd sys-apps/util-linux/util-linux-2.40.1-r1.ebuild sys-apps/util-linux/util-linux-2.40.1-r2.ebuild sys-apps/util-linux/util-linux-9999.ebuild X-VCS-Directories: sys-apps/util-linux/ sys-apps/util-linux/files/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: c41f012f4b8aa5b7fc231a2da8a0dd8a5af72ec1 X-VCS-Branch: master Date: Mon, 20 May 2024 15:06:48 +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: a4cb8fb0-d8c6-4d10-91e2-fdf417991a59 X-Archives-Hash: cd520d08bba7379a2719add3b92dc205 commit: c41f012f4b8aa5b7fc231a2da8a0dd8a5af72ec1 Author: Mike Gilbert gentoo org> AuthorDate: Mon May 20 15:03:48 2024 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Mon May 20 15:06:06 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c41f012f sys-apps/util-linux: uuidd fixes for OpenRC The build system only installs the tmpfiles.d file when systemd is enabled. Compensate by calling checkpath in the init script. Closes: https://bugs.gentoo.org/932276 Signed-off-by: Mike Gilbert gentoo.org> sys-apps/util-linux/files/uuidd.initd | 5 +++++ .../{util-linux-2.40.1-r1.ebuild => util-linux-2.40.1-r2.ebuild} | 4 ++-- sys-apps/util-linux/util-linux-9999.ebuild | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/sys-apps/util-linux/files/uuidd.initd b/sys-apps/util-linux/files/uuidd.initd index 329929e9a9ab..b1e7e563b297 100644 --- a/sys-apps/util-linux/files/uuidd.initd +++ b/sys-apps/util-linux/files/uuidd.initd @@ -8,3 +8,8 @@ pidfile=/run/uuidd/uuidd.pid depend() { need clock localmount } + +start_pre() { + checkpath -d -m 2755 -o uuidd:uuidd /run/uuidd && + checkpath -d -m 0755 -o uuidd:uuidd /var/lib/libuuid +} diff --git a/sys-apps/util-linux/util-linux-2.40.1-r1.ebuild b/sys-apps/util-linux/util-linux-2.40.1-r2.ebuild similarity index 99% rename from sys-apps/util-linux/util-linux-2.40.1-r1.ebuild rename to sys-apps/util-linux/util-linux-2.40.1-r2.ebuild index c112b4749522..a9980ed89514 100644 --- a/sys-apps/util-linux/util-linux-2.40.1-r1.ebuild +++ b/sys-apps/util-linux/util-linux-2.40.1-r2.ebuild @@ -87,7 +87,7 @@ RDEPEND+=" ) uuidd? ( acct-user/uuidd - virtual/tmpfiles + systemd? ( virtual/tmpfiles ) ) !net-wireless/rfkill " @@ -426,7 +426,7 @@ pkg_postinst() { elog "might want to add --noclear to your /etc/inittab lines." fi - if use uuidd; then + if use systemd && use uuidd; then tmpfiles_process uuidd-tmpfiles.conf fi } diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild index 053f45a99077..f3ea42edeeff 100644 --- a/sys-apps/util-linux/util-linux-9999.ebuild +++ b/sys-apps/util-linux/util-linux-9999.ebuild @@ -87,7 +87,7 @@ RDEPEND+=" ) uuidd? ( acct-user/uuidd - virtual/tmpfiles + systemd? ( virtual/tmpfiles ) ) !net-wireless/rfkill " @@ -425,7 +425,7 @@ pkg_postinst() { elog "might want to add --noclear to your /etc/inittab lines." fi - if use uuidd; then + if use systemd && use uuidd; then tmpfiles_process uuidd-tmpfiles.conf fi }