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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7177D138334 for ; Sun, 11 Aug 2019 11:20:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A0C2AE089E; Sun, 11 Aug 2019 11:20:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8743FE089E for ; Sun, 11 Aug 2019 11:20:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6B67B3498F2 for ; Sun, 11 Aug 2019 11:20:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 31043773 for ; Sun, 11 Aug 2019 11:20:43 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1565522423.749f1e506f33dbd0a1563df68848e51e6fcb93de.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/openrc/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/openrc/openrc-9999.ebuild X-VCS-Directories: sys-apps/openrc/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 749f1e506f33dbd0a1563df68848e51e6fcb93de X-VCS-Branch: master Date: Sun, 11 Aug 2019 11:20:43 +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: f9816675-959b-43b6-b275-0163dd6eed1b X-Archives-Hash: e3ddf067f66e1cae88b79d744e1bbc80 commit: 749f1e506f33dbd0a1563df68848e51e6fcb93de Author: David Seifert gentoo org> AuthorDate: Sun Aug 11 11:20:23 2019 +0000 Commit: David Seifert gentoo org> CommitDate: Sun Aug 11 11:20:23 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=749f1e50 sys-apps/openrc: [QA] Fix missing trailing slash Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: David Seifert gentoo.org> sys-apps/openrc/openrc-9999.ebuild | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild index 891a73480c4..6bf7ded639b 100644 --- a/sys-apps/openrc/openrc-9999.ebuild +++ b/sys-apps/openrc/openrc-9999.ebuild @@ -159,10 +159,10 @@ src_install() { pkg_preinst() { # avoid default thrashing in conf.d files when possible #295406 - if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then + if [[ -e "${EROOT}"/etc/conf.d/hostname ]] ; then ( unset hostname HOSTNAME - source "${EROOT}"etc/conf.d/hostname + source "${EROOT}"/etc/conf.d/hostname : ${hostname:=${HOSTNAME}} [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}" ) @@ -183,11 +183,11 @@ pkg_postinst() { # Added for 0.35. if use kernel_linux && [[ ! -h "${EROOT}"/lib ]]; then if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then - cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib + cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"/lib fi elif ! use kernel_linux; then if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then - cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib + cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"/lib fi fi @@ -202,7 +202,7 @@ pkg_postinst() { ewarn fi - if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then + if use newnet && [ ! -e "${EROOT}"/etc/runlevels/boot/network ]; then ewarn "Please add the network service to your boot runlevel" ewarn "as soon as possible. Not doing so could leave you with a system" ewarn "without networking."