From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1PzKfZ-0008Mv-E6 for garchives@archives.gentoo.org; Tue, 15 Mar 2011 03:11:37 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 850521C018; Tue, 15 Mar 2011 03:11:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3CC631C018 for ; Tue, 15 Mar 2011 03:11:29 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 61A8D1B418B for ; Tue, 15 Mar 2011 03:11:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id BD7428006D for ; Tue, 15 Mar 2011 03:11:27 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: Subject: [gentoo-commits] proj/openrc:master commit in: etc/ X-VCS-Repository: proj/openrc X-VCS-Files: etc/Makefile X-VCS-Directories: etc/ X-VCS-Committer: williamH X-VCS-Committer-Name: William Hubbs X-VCS-Revision: d7e48fe643bc82ae6280193dc42f5fef7265abac Date: Tue, 15 Mar 2011 03:11:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 0f6cc77d6cf18218aca178427b1ae089 commit: d7e48fe643bc82ae6280193dc42f5fef7265abac Author: Mike Frysinger gentoo org> AuthorDate: Fri Mar 11 01:24:28 2011 +0000 Commit: William Hubbs gentoo org> CommitDate: Tue Mar 15 01:35:08 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/openrc.git;a=3D= commit;h=3Dd7e48fe6 rc_sys: let default behavior be automagic The default rc_sys behavior was changed to always require manual intervention by users. This pretty much breaks all of the diff system variants out there if people don't explicitly edit their rc.conf file ahead of time. We should have things work "out of the box" as much as possible and reasonable. X-Gentoo-Bug: 357247 X-Gentoo-Bug-URL: http://bugs.gentoo.org/357247 Signed-off-by: Mike Frysinger gentoo.org> --- etc/Makefile | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/etc/Makefile b/etc/Makefile index 24e5455..314225a 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -8,5 +8,14 @@ include ${MK}/os.mk include Makefile.${OS} include ${MK}/scripts.mk =20 +# We can't use "ifndef" here because that treats set-but-empty +# as not-set which is not what we want +MKRCSYS ?=3D automagicplease +ifeq ($(MKRCSYS),automagicplease) +# If the user isn't picking a default, then have the +# config go with runtime automagic detection #357247 +rc.conf: SED_EXTRA +=3D -e '/^rc_sys=3D""/s:^:\#:' +MKRCSYS =3D +endif rc.conf: rc.conf.in rc.conf.${OS} ${SED} ${SED_REPLACE} ${SED_EXTRA} $^ > $@