| 1 |
commit: 0c1ea876a19c8474bedd2a63e68508f74cebdafb |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Aug 31 00:18:42 2019 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 31 00:18:42 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c1ea876 |
| 7 |
|
| 8 |
sys-fs/udev-init-scripts: fix install on prefix |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/682422 |
| 11 |
Package-Manager: Portage-2.3.73_p4, Repoman-2.3.17_p24 |
| 12 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 13 |
|
| 14 |
sys-fs/udev-init-scripts/udev-init-scripts-33.ebuild | 13 +++++++++---- |
| 15 |
sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild | 13 +++++++++---- |
| 16 |
2 files changed, 18 insertions(+), 8 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-33.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-33.ebuild |
| 19 |
index 2090016f2a5..1646e4a87e8 100644 |
| 20 |
--- a/sys-fs/udev-init-scripts/udev-init-scripts-33.ebuild |
| 21 |
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-33.ebuild |
| 22 |
@@ -25,13 +25,18 @@ RESTRICT="test" |
| 23 |
RDEPEND=">=virtual/udev-217 |
| 24 |
!<sys-apps/openrc-0.14" |
| 25 |
|
| 26 |
+src_install() { |
| 27 |
+ local -x SYSCONFDIR="${EPREFIX}/etc" |
| 28 |
+ default |
| 29 |
+} |
| 30 |
+ |
| 31 |
pkg_postinst() { |
| 32 |
# Add udev and udev-trigger to the sysinit runlevel automatically. |
| 33 |
for f in udev udev-trigger; do |
| 34 |
- if [[ -x ${ROOT%/}/etc/init.d/${f} && |
| 35 |
- -d ${ROOT%/}/etc/runlevels/sysinit && |
| 36 |
- ! -L "${ROOT%/}/etc/runlevels/sysinit/${f}" ]]; then |
| 37 |
- ln -snf /etc/init.d/${f} "${ROOT%/}"/etc/runlevels/sysinit/${f} |
| 38 |
+ if [[ -x "${EROOT}/etc/init.d/${f}" && |
| 39 |
+ -d "${EROOT}/etc/runlevels/sysinit" && |
| 40 |
+ ! -L "${EROOT}/etc/runlevels/sysinit/${f}" ]]; then |
| 41 |
+ ln -snf "${EPREFIX}/etc/init.d/${f}" "${EROOT}/etc/runlevels/sysinit/${f}" |
| 42 |
ewarn "Adding ${f} to the sysinit runlevel" |
| 43 |
fi |
| 44 |
done |
| 45 |
|
| 46 |
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild |
| 47 |
index b514fc5923d..4ce4b403509 100644 |
| 48 |
--- a/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild |
| 49 |
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild |
| 50 |
@@ -25,13 +25,18 @@ RESTRICT="test" |
| 51 |
RDEPEND=">=virtual/udev-217 |
| 52 |
!<sys-apps/openrc-0.14" |
| 53 |
|
| 54 |
+src_install() { |
| 55 |
+ local -x SYSCONFDIR="${EPREFIX}/etc" |
| 56 |
+ default |
| 57 |
+} |
| 58 |
+ |
| 59 |
pkg_postinst() { |
| 60 |
# Add udev and udev-trigger to the sysinit runlevel automatically. |
| 61 |
for f in udev udev-trigger; do |
| 62 |
- if [[ -x ${ROOT%/}/etc/init.d/${f} && |
| 63 |
- -d ${ROOT%/}/etc/runlevels/sysinit && |
| 64 |
- ! -L "${ROOT%/}/etc/runlevels/sysinit/${f}" ]]; then |
| 65 |
- ln -snf /etc/init.d/${f} "${ROOT%/}"/etc/runlevels/sysinit/${f} |
| 66 |
+ if [[ -x "${EROOT}/etc/init.d/${f}" && |
| 67 |
+ -d "${EROOT}/etc/runlevels/sysinit" && |
| 68 |
+ ! -L "${EROOT}/etc/runlevels/sysinit/${f}" ]]; then |
| 69 |
+ ln -snf "${EPREFIX}/etc/init.d/${f}" "${EROOT}/etc/runlevels/sysinit/${f}" |
| 70 |
ewarn "Adding ${f} to the sysinit runlevel" |
| 71 |
fi |
| 72 |
done |
Archives