From owner-svn-src-head@freebsd.org Thu Oct 18 02:07:31 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2D06B10E761E; Thu, 18 Oct 2018 02:07:31 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D386473BFD; Thu, 18 Oct 2018 02:07:30 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CD6B31969F; Thu, 18 Oct 2018 02:07:30 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9I27UTW033544; Thu, 18 Oct 2018 02:07:30 GMT (envelope-from bz@FreeBSD.org) Received: (from bz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9I27U2Z033543; Thu, 18 Oct 2018 02:07:30 GMT (envelope-from bz@FreeBSD.org) Message-Id: <201810180207.w9I27U2Z033543@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org using -f From: "Bjoern A. Zeeb" Date: Thu, 18 Oct 2018 02:07:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339417 - in head/libexec/rc: . rc.d X-SVN-Group: head X-SVN-Commit-Author: bz X-SVN-Commit-Paths: in head/libexec/rc: . rc.d X-SVN-Commit-Revision: 339417 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Oct 2018 02:07:31 -0000 Author: bz Date: Thu Oct 18 02:07:30 2018 New Revision: 339417 URL: https://svnweb.freebsd.org/changeset/base/339417 Log: While preparing to move init(8) to its own package as indicated in r339413, a current pkgbase update problem came up. For users testing pkgbase at the moment there is no (automatic) way to pick up new base packages (yet). As a result rather than also moving init(8) to its own package, back out the part of the change in r339413 that moved rc* to its own package and defer creating new packages until the infrastructure is in place to handle these cases. Both init and rc* are considered too problematic to be lost by early adaptors at this stage. Discussed with: brd Reviewed by: brd Approved by: re (gjb) Modified: head/libexec/rc/Makefile head/libexec/rc/rc.d/Makefile Modified: head/libexec/rc/Makefile ============================================================================== --- head/libexec/rc/Makefile Thu Oct 18 00:51:42 2018 (r339416) +++ head/libexec/rc/Makefile Thu Oct 18 02:07:30 2018 (r339417) @@ -9,7 +9,7 @@ CONFETCEXECDIR= /etc CONFETCEXECMODE= 755 CONFETCDEFAULTSDIR= /etc/defaults CONFETCDEFAULTS= rc.conf -PACKAGE=rc +#PACKAGE=rc SUBDIR+= rc.d Modified: head/libexec/rc/rc.d/Makefile ============================================================================== --- head/libexec/rc/rc.d/Makefile Thu Oct 18 00:51:42 2018 (r339416) +++ head/libexec/rc/rc.d/Makefile Thu Oct 18 02:07:30 2018 (r339417) @@ -4,7 +4,7 @@ CONFDIR= /etc/rc.d CONFGROUPS= CONFS -PACKAGE=rc +#PACKAGE=rc CONFS= DAEMON \ FILESYSTEMS \