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 09C6E138AA1 for ; Sun, 17 Feb 2013 02:49:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C0844E0504; Sun, 17 Feb 2013 02:49:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 299C0E0504 for ; Sun, 17 Feb 2013 02:49:17 +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 468CA33DB64 for ; Sun, 17 Feb 2013 02:49:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 2968AE4089 for ; Sun, 17 Feb 2013 02:49:14 +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: <1361069194.414ef6466187c1452b97b69f946cdd150eaa465d.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: 414ef6466187c1452b97b69f946cdd150eaa465d X-VCS-Branch: master Date: Sun, 17 Feb 2013 02:49:14 +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: 292f931a-d920-41b2-b438-d3c291fa1f5c X-Archives-Hash: 91c2c96a6c430e507593997392be6dcd commit: 414ef6466187c1452b97b69f946cdd150eaa465d Author: Andrew Gregory gmail com> AuthorDate: Tue Feb 12 03:13:29 2013 +0000 Commit: William Hubbs gentoo org> CommitDate: Sun Feb 17 02:46:34 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=414ef646 disable default -prefix services if MKPREFIX = yes Certain services were not being enabled by default if PREFIX was set. This appears to have been intended for Gentoo Prefix systems which are indicated by MKPREFIX not PREFIX. Signed-off-by: Andrew Gregory gmail.com> --- runlevels/Makefile | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/runlevels/Makefile b/runlevels/Makefile index e459d15..7bcf29f 100644 --- a/runlevels/Makefile +++ b/runlevels/Makefile @@ -53,7 +53,7 @@ install: if ! test -d "${SYSINITDIR}"; then \ ${INSTALL} -d ${SYSINITDIR} || exit $$?; \ for x in ${SYSINIT}; do \ - if test -n "${PREFIX}"; then \ + if test "${MKPREFIX}" = yes; then \ grep -q "keyword .*-prefix" ${INITFILES}/"$$x" && continue; \ fi; \ ln -snf ${INITDIR}/"$$x" ${SYSINITDIR}/"$$x" || exit $$?; done \ @@ -61,7 +61,7 @@ install: if ! test -d "${BOOTDIR}"; then \ ${INSTALL} -d ${BOOTDIR} || exit $$?; \ for x in ${BOOT}; do \ - if test -n "${PREFIX}"; then \ + if test "${MKPREFIX}" = yes; then \ grep -q "keyword .*-prefix" ${INITFILES}/"$$x" && continue; \ fi; \ ln -snf ${INITDIR}/"$$x" ${BOOTDIR}/"$$x" || exit $$?; \ @@ -70,7 +70,7 @@ install: if ! test -d "${DEFAULTDIR}"; then \ ${INSTALL} -d ${DEFAULTDIR} || exit $$?; \ for x in ${DEFAULT}; do \ - if test -n "${PREFIX}"; then \ + if test "${MKPREFIX}" = yes; then \ grep -q "keyword .*-prefix" ${INITFILES}/"$$x" && continue; \ fi; \ ln -snf ${INITDIR}/"$$x" ${DEFAULTDIR}/"$$x" || exit $$?; done \ @@ -78,7 +78,7 @@ install: if ! test -d "${SHUTDOWNDIR}"; then \ ${INSTALL} -d ${SHUTDOWNDIR} || exit $$?; \ for x in ${SHUTDOWN}; do \ - if test -n "${PREFIX}"; then \ + if test "${MKPREFIX}" = yes; then \ grep -q "keyword .*-prefix" ${INITFILES}/"$$x" && continue; \ fi; \ ln -snf ${INITDIR}/"$$x" ${SHUTDOWNDIR}/"$$x" || exit $$?; done \