From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 3212A138200 for ; Sun, 7 Oct 2012 22:51:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B29C821C020; Sun, 7 Oct 2012 22:51:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2078321C026 for ; Sun, 7 Oct 2012 22:51:07 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7B61333C878 for ; Sun, 7 Oct 2012 22:51:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 5155AE543E for ; Sun, 7 Oct 2012 22:51:04 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1349465220.da842085ce3d9a8c32fdaecabefd6fd2ab123cc0.WilliamH@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: runlevels/ X-VCS-Repository: proj/openrc X-VCS-Files: runlevels/Makefile X-VCS-Directories: runlevels/ X-VCS-Committer: WilliamH X-VCS-Committer-Name: William Hubbs X-VCS-Revision: da842085ce3d9a8c32fdaecabefd6fd2ab123cc0 X-VCS-Branch: master Date: Sun, 7 Oct 2012 22:51:04 +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-Archives-Salt: e61ace47-3068-478c-8154-05ef48ac92aa X-Archives-Hash: 9e1f9b8d649421ef4db66a8efcf371fd commit: da842085ce3d9a8c32fdaecabefd6fd2ab123cc0 Author: Andrew Gregory gmail com> AuthorDate: Sat Sep 29 14:49:48 2012 +0000 Commit: William Hubbs gentoo org> CommitDate: Fri Oct 5 19:27:00 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=da842085 Fix default runlevel symlink paths runlevels/Makefile currently uses ${PREFIX} when creating the initial runlevel symlinks, but the init files are installed to ${INITDIR}, which results in broken symlinks if ${SYSCONFDIR} is set to something other than ${PREFIX}/etc Signed-off-by: Andrew Gregory gmail.com> --- runlevels/Makefile | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/runlevels/Makefile b/runlevels/Makefile index e78e2d1..a4fd006 100644 --- a/runlevels/Makefile +++ b/runlevels/Makefile @@ -14,7 +14,7 @@ ifeq (${MKNET},) BOOT+= network staticroute endif -INITDIR= ../init.d +INITFILES= ../init.d MK= ../mk include ${MK}/sys.mk @@ -54,34 +54,34 @@ install: ${INSTALL} -d ${SYSINITDIR} || exit $$?; \ for x in ${SYSINIT}; do \ if test -n "${PREFIX}"; then \ - grep -q "keyword .*-prefix" ${INITDIR}/"$$x" && continue; \ + grep -q "keyword .*-prefix" ${INITFILES}/"$$x" && continue; \ fi; \ - ln -snf ${PREFIX}/etc/init.d/"$$x" ${SYSINITDIR}/"$$x" || exit $$?; done \ + ln -snf ${INITDIR}/"$$x" ${SYSINITDIR}/"$$x" || exit $$?; done \ fi if ! test -d "${BOOTDIR}"; then \ ${INSTALL} -d ${BOOTDIR} || exit $$?; \ for x in ${BOOT}; do \ if test -n "${PREFIX}"; then \ - grep -q "keyword .*-prefix" ${INITDIR}/"$$x" && continue; \ + grep -q "keyword .*-prefix" ${INITFILES}/"$$x" && continue; \ fi; \ - ln -snf ${PREFIX}/etc/init.d/"$$x" ${BOOTDIR}/"$$x" || exit $$?; \ + ln -snf ${INITDIR}/"$$x" ${BOOTDIR}/"$$x" || exit $$?; \ done \ fi if ! test -d "${DEFAULTDIR}"; then \ ${INSTALL} -d ${DEFAULTDIR} || exit $$?; \ for x in ${DEFAULT}; do \ if test -n "${PREFIX}"; then \ - grep -q "keyword .*-prefix" ${INITDIR}/"$$x" && continue; \ + grep -q "keyword .*-prefix" ${INITFILES}/"$$x" && continue; \ fi; \ - ln -snf ${PREFIX}/etc/init.d/"$$x" ${DEFAULTDIR}/"$$x" || exit $$?; done \ + ln -snf ${INITDIR}/"$$x" ${DEFAULTDIR}/"$$x" || exit $$?; done \ fi if ! test -d "${SHUTDOWNDIR}"; then \ ${INSTALL} -d ${SHUTDOWNDIR} || exit $$?; \ for x in ${SHUTDOWN}; do \ if test -n "${PREFIX}"; then \ - grep -q "keyword .*-prefix" ${INITDIR}/"$$x" && continue; \ + grep -q "keyword .*-prefix" ${INITFILES}/"$$x" && continue; \ fi; \ - ln -snf ${PREFIX}/etc/init.d/"$$x" ${SHUTDOWNDIR}/"$$x" || exit $$?; done \ + ln -snf ${INITDIR}/"$$x" ${SHUTDOWNDIR}/"$$x" || exit $$?; done \ fi check test::