summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2018-06-08 09:15:57 +0200
committerMichał Górny <mgorny@gentoo.org>2018-06-13 10:09:58 +0200
commit4912da31e5483c61ef7730ff345e7fc10d44a414 (patch)
tree9715173a4c32e820eb2da195bfd4e08ef45bb22d /eclass
parentpython-utils-r1.eclass: Sanitize insopts/exeopts (diff)
downloadgentoo-4912da31e5483c61ef7730ff345e7fc10d44a414.tar.gz
gentoo-4912da31e5483c61ef7730ff345e7fc10d44a414.tar.bz2
gentoo-4912da31e5483c61ef7730ff345e7fc10d44a414.zip
systemd.eclass: Sanitize insopts
Sanitize insopts when calling doins, in order to avoid prior insopts calls accidentally affecting do*/new* functions defined by the eclass.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/systemd.eclass8
1 files changed, 8 insertions, 0 deletions
diff --git a/eclass/systemd.eclass b/eclass/systemd.eclass
index 6dda4353064a..72f4845efc45 100644
--- a/eclass/systemd.eclass
+++ b/eclass/systemd.eclass
@@ -151,6 +151,7 @@ systemd_dounit() {
debug-print-function ${FUNCNAME} "${@}"
(
+ insopts -m 0644
insinto "$(_systemd_get_systemunitdir)"
doins "${@}"
)
@@ -165,6 +166,7 @@ systemd_newunit() {
debug-print-function ${FUNCNAME} "${@}"
(
+ insopts -m 0644
insinto "$(_systemd_get_systemunitdir)"
newins "${@}"
)
@@ -179,6 +181,7 @@ systemd_douserunit() {
debug-print-function ${FUNCNAME} "${@}"
(
+ insopts -m 0644
insinto "$(_systemd_get_userunitdir)"
doins "${@}"
)
@@ -193,6 +196,7 @@ systemd_newuserunit() {
debug-print-function ${FUNCNAME} "${@}"
(
+ insopts -m 0644
insinto "$(_systemd_get_userunitdir)"
newins "${@}"
)
@@ -222,6 +226,7 @@ systemd_install_serviced() {
[[ ${service} == *.d ]] && die "Service must not have .d suffix"
(
+ insopts -m 0644
insinto /etc/systemd/system/"${service}".d
newins "${src}" 00gentoo.conf
)
@@ -241,6 +246,7 @@ systemd_dotmpfilesd() {
done
(
+ insopts -m 0644
insinto /usr/lib/tmpfiles.d/
doins "${@}"
)
@@ -258,6 +264,7 @@ systemd_newtmpfilesd() {
|| die 'tmpfiles.d files need to have .conf suffix.'
(
+ insopts -m 0644
insinto /usr/lib/tmpfiles.d/
newins "${@}"
)
@@ -320,6 +327,7 @@ systemd_enable_ntpunit() {
done
(
+ insopts -m 0644
insinto "$(_systemd_get_utildir)"/ntp-units.d
doins "${T}"/${ntpunit_name}.list
)