From owner-cvs-src@FreeBSD.ORG Sat Oct 9 00:21:14 2004 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 53ACE16A4CE; Sat, 9 Oct 2004 00:21:14 +0000 (GMT) Received: from odin.ac.hmc.edu (Odin.AC.HMC.Edu [134.173.32.75]) by mx1.FreeBSD.org (Postfix) with ESMTP id 26FA643D48; Sat, 9 Oct 2004 00:21:13 +0000 (GMT) (envelope-from brdavis@odin.ac.hmc.edu) Received: from odin.ac.hmc.edu (localhost.localdomain [127.0.0.1]) by odin.ac.hmc.edu (8.13.0/8.13.0) with ESMTP id i990Kpfd020939; Fri, 8 Oct 2004 17:20:51 -0700 Received: (from brdavis@localhost) by odin.ac.hmc.edu (8.13.0/8.13.0/Submit) id i990KpoC020938; Fri, 8 Oct 2004 17:20:51 -0700 Date: Fri, 8 Oct 2004 17:20:51 -0700 From: Brooks Davis To: Brian Somers Message-ID: <20041009002051.GA20265@odin.ac.hmc.edu> References: <200410071355.i97DtSJq024575@repoman.freebsd.org> <20041009011553.01708de1@dev.lan.Awfulhak.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="EVF5PPMfhYS0aIcm" Content-Disposition: inline In-Reply-To: <20041009011553.01708de1@dev.lan.Awfulhak.org> User-Agent: Mutt/1.4.1i X-Virus-Scanned: by amavisd-new X-Spam-Status: No, hits=0.0 required=8.0 tests=none autolearn=no version=2.63 X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on odin.ac.hmc.edu cc: cvs-src@FreeBSD.org cc: Mike Makonnen cc: src-committers@FreeBSD.org cc: cvs-all@FreeBSD.org Subject: Re: What we keep under /etc (was: cvs commit: src/etc rc rc.shutdown src/etc/rc.d ...) X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Oct 2004 00:21:14 -0000 --EVF5PPMfhYS0aIcm Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Oct 09, 2004 at 01:15:53AM +0100, Brian Somers wrote: > On Thu, 7 Oct 2004 13:55:28 +0000 (UTC), Mike Makonnen = wrote: > > mtm 2004-10-07 13:55:28 UTC > >=20 > > FreeBSD src repository > >=20 > > Modified files: > > etc rc rc.shutdown=20 > > etc/rc.d DAEMON LOGIN NETWORKING SERVERS abi=20 > > accounting addswap adjkerntz amd apm apmd=20 > > archdep atm1 atm2 atm3 bgfsck bootparams=20 > > ccd cleanvar cleartmp cron devd devfs=20 > > dhclient dmesg dumpon early.sh fsck gbde=20 > > gbde_swap hostname ike inetd initdiskless=20 > > initrandom ip6addrctl ip6fw ipfilter ipfs=20 > > ipfw ipmon ipnat ipsec ipxrouted isdnd=20 > > jail kadmind kerberos keyserv kldxref=20 > > kpasswdd ldconfig local localpkg lomac=20 > > lpd mixer motd mountcritlocal=20 > > mountcritremote mountd moused mroute6d=20 > > mrouted msgs named natd netif netoptions=20 > > network_ipv6 nfsclient nfsd nfslocking=20 > > nfsserver nisdomain nsswitch ntpd ntpdate=20 > > othermta pccard pcvt pf pflog=20 > > power_profile ppp-user pppoed=20 > > preseedrandom pwcheck quota ramdisk=20 > > ramdisk-own random rarpd rcconf.sh resolv=20 > > root route6d routed routing rpcbind=20 > > rtadvd rwho savecore securelevel sendmail=20 > > serial sppp sshd swap1 syscons sysctl=20 > > syslogd timed tmp usbd var vinum=20 > > virecover watchdogd ypbind yppasswdd=20 > > ypserv ypset ypupdated ypxfrd=20 > > Log: > > Remove the requirement for the FreeBSD keyword as it no longer > > makes any sense. > > =20 > > Discussed with: dougb, brooks > > MFC after: 3 days >=20 > This makes life painful enough to ask.... As long as you don't actually modify the scripts you can just do an "rm /etc/rc.d/*" and run mergemaster with -i. It's a whole lot less painful that way. -- Brooks --=20 Any statement of the form "X is the one, true Y" is FALSE. PGP fingerprint 655D 519C 26A7 82E7 2529 9BF0 5D8E 8BE9 F238 1AD4 --EVF5PPMfhYS0aIcm Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) iD8DBQFBZy7iXY6L6fI4GtQRAt9mAKDgYcjDmhrFycA55dZfPBKEu5nsLQCfd7et GoHV8M3Fvqk5Oeuc//Z46z4= =znkN -----END PGP SIGNATURE----- --EVF5PPMfhYS0aIcm--