* [gentoo-dev] [PATCH 1/2] systemd.eclass: fix systemd_tmpfiles_create under EAPI 7
@ 2020-09-06 14:01 Mike Gilbert
2020-09-06 14:01 ` [gentoo-dev] [PATCH 2/2] systemd.eclass: deprecate tmpfiles functions Mike Gilbert
0 siblings, 1 reply; 2+ messages in thread
From: Mike Gilbert @ 2020-09-06 14:01 UTC (permalink / raw
To: gentoo-dev; +Cc: Mike Gilbert
Closes: https://bugs.gentoo.org/740586
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
---
eclass/systemd.eclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eclass/systemd.eclass b/eclass/systemd.eclass
index 04f277e94d64..97ecf0786aef 100644
--- a/eclass/systemd.eclass
+++ b/eclass/systemd.eclass
@@ -448,7 +448,7 @@ systemd_tmpfiles_create() {
[[ ${EBUILD_PHASE} == postinst ]] || die "${FUNCNAME}: Only valid in pkg_postinst"
[[ ${#} -gt 0 ]] || die "${FUNCNAME}: Must specify at least one filename"
- [[ ${ROOT} == / ]] || return 0
+ [[ ${ROOT:-/} == / ]] || return 0
type systemd-tmpfiles &> /dev/null || return 0
systemd-tmpfiles --create "${@}"
}
--
2.28.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-dev] [PATCH 2/2] systemd.eclass: deprecate tmpfiles functions
2020-09-06 14:01 [gentoo-dev] [PATCH 1/2] systemd.eclass: fix systemd_tmpfiles_create under EAPI 7 Mike Gilbert
@ 2020-09-06 14:01 ` Mike Gilbert
0 siblings, 0 replies; 2+ messages in thread
From: Mike Gilbert @ 2020-09-06 14:01 UTC (permalink / raw
To: gentoo-dev; +Cc: Mike Gilbert
Bug: https://bugs.gentoo.org/740638
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
---
eclass/systemd.eclass | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/eclass/systemd.eclass b/eclass/systemd.eclass
index 97ecf0786aef..09ea71bbfdc5 100644
--- a/eclass/systemd.eclass
+++ b/eclass/systemd.eclass
@@ -240,6 +240,8 @@ systemd_install_serviced() {
# @FUNCTION: systemd_dotmpfilesd
# @USAGE: <tmpfilesd>...
# @DESCRIPTION:
+# Deprecated in favor of tmpfiles.eclass.
+#
# Install systemd tmpfiles.d files. Uses doins, thus it is fatal
# in EAPI 4 and non-fatal in earlier EAPIs.
systemd_dotmpfilesd() {
@@ -260,6 +262,8 @@ systemd_dotmpfilesd() {
# @FUNCTION: systemd_newtmpfilesd
# @USAGE: <old-name> <new-name>.conf
# @DESCRIPTION:
+# Deprecated in favor of tmpfiles.eclass.
+#
# Install systemd tmpfiles.d file under a new name. Uses newins, thus it
# is fatal in EAPI 4 and non-fatal in earlier EAPIs.
systemd_newtmpfilesd() {
@@ -435,6 +439,8 @@ systemd_is_booted() {
# @FUNCTION: systemd_tmpfiles_create
# @USAGE: <tmpfilesd> ...
# @DESCRIPTION:
+# Deprecated in favor of tmpfiles.eclass.
+#
# Invokes systemd-tmpfiles --create with given arguments.
# Does nothing if ROOT != / or systemd-tmpfiles is not in PATH.
# This function should be called from pkg_postinst.
--
2.28.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-09-06 14:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-06 14:01 [gentoo-dev] [PATCH 1/2] systemd.eclass: fix systemd_tmpfiles_create under EAPI 7 Mike Gilbert
2020-09-06 14:01 ` [gentoo-dev] [PATCH 2/2] systemd.eclass: deprecate tmpfiles functions Mike Gilbert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox