From c41f012f4b8aa5b7fc231a2da8a0dd8a5af72ec1 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Mon, 20 May 2024 11:03:48 -0400 Subject: [PATCH] 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 --- sys-apps/util-linux/files/uuidd.initd | 5 +++++ ...il-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(-) rename sys-apps/util-linux/{util-linux-2.40.1-r1.ebuild => util-linux-2.40.1-r2.ebuild} (99%) diff --git a/sys-apps/util-linux/files/uuidd.initd b/sys-apps/util-linux/files/uuidd.initd index 329929e9a9ab7..b1e7e563b2970 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 c112b47495229..a9980ed89514e 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 053f45a990773..f3ea42edeeff2 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 }