Re: svn commit: r336845 - in head: etc etc/defaults etc/rc.d sbin/init sbin/init/rc.d
On Sun, Jul 29, 2018, at 12:33 PM, Konstantin Belousov wrote: > On Sun, Jul 29, 2018 at 11:51:32AM -0600, Brad Davis wrote: > > On Sun, Jul 29, 2018, at 11:44 AM, Konstantin Belousov wrote: > > > On Sun, Jul 29, 2018 at 11:01:27AM -0600, Brad Davis wrote: > > > > On Sun, Jul 29, 2018, at 9:42 AM, Konstantin Belousov wrote: > > > > > On Sat, Jul 28, 2018 at 08:36:23PM +, Brad Davis wrote: > > > > > > Author: brd > > > > > > Date: Sat Jul 28 20:36:23 2018 > > > > > > New Revision: 336845 > > > > > > URL: https://svnweb.freebsd.org/changeset/base/336845 > > > > > > > > > > > > Log: > > > > > > Move rc startup scripts from etc/ to sbin/init/ > > > > > Why all these moves are useful ? > > > > > > > > > > No commit message explained what is the goal of the moves, and why > > > > > it is better that way comparing the existing src/etc collection. > > > > > > > > For pkg base we need to distill things out of etc/ and into places > > > > where they fit better. This enables them to be pkged up with the > > > > parts of the system them belong with and the CONFS= tags them as > > > > config files so that pkg will know about them and be able to 3-way > > > > merge them. This keeps the flexibility we have today with the many > > > > WITH_*/WITHOUT_* knobs. Though it is not without trade offs, keeping > > > > all of one part of the system together is simpler and makes some > > > > maintenance easier. > > > I do not see why do we need this for the pkgbase. There is nothing > > > wrong with installation of the whole clean dist-supplied /etc on > > > the fresh system. More, as you noted yourself, the ability to have > > > all the config files installed is simpler and allows to overview and > > > prepare configuration without requiring to have the corresponding > > > packages installed. > > > > On a fresh system sure, but on upgrades that is a problem. > > > > I was not advocating for having all the etc files installed, even when you > > do not have that pkg installed. I am saying it matches what happens today > > if you have, for example, WITHOUT_ACPI=y set. > > > All of this should have been written, perhaps even with more details, > in the commit message. You are right, I will working on improving my commit messages. Regards, Brad Davis ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r336845 - in head: etc etc/defaults etc/rc.d sbin/init sbin/init/rc.d
On Sun, Jul 29, 2018 at 11:51:32AM -0600, Brad Davis wrote: > On Sun, Jul 29, 2018, at 11:44 AM, Konstantin Belousov wrote: > > On Sun, Jul 29, 2018 at 11:01:27AM -0600, Brad Davis wrote: > > > On Sun, Jul 29, 2018, at 9:42 AM, Konstantin Belousov wrote: > > > > On Sat, Jul 28, 2018 at 08:36:23PM +, Brad Davis wrote: > > > > > Author: brd > > > > > Date: Sat Jul 28 20:36:23 2018 > > > > > New Revision: 336845 > > > > > URL: https://svnweb.freebsd.org/changeset/base/336845 > > > > > > > > > > Log: > > > > > Move rc startup scripts from etc/ to sbin/init/ > > > > Why all these moves are useful ? > > > > > > > > No commit message explained what is the goal of the moves, and why > > > > it is better that way comparing the existing src/etc collection. > > > > > > For pkg base we need to distill things out of etc/ and into places > > > where they fit better. This enables them to be pkged up with the > > > parts of the system them belong with and the CONFS= tags them as > > > config files so that pkg will know about them and be able to 3-way > > > merge them. This keeps the flexibility we have today with the many > > > WITH_*/WITHOUT_* knobs. Though it is not without trade offs, keeping > > > all of one part of the system together is simpler and makes some > > > maintenance easier. > > I do not see why do we need this for the pkgbase. There is nothing > > wrong with installation of the whole clean dist-supplied /etc on > > the fresh system. More, as you noted yourself, the ability to have > > all the config files installed is simpler and allows to overview and > > prepare configuration without requiring to have the corresponding > > packages installed. > > On a fresh system sure, but on upgrades that is a problem. > > I was not advocating for having all the etc files installed, even when you do > not have that pkg installed. I am saying it matches what happens today if > you have, for example, WITHOUT_ACPI=y set. > All of this should have been written, perhaps even with more details, in the commit message. Still, sbin/init/rc is nonsence. > > > > Moving startup scripts to sbin/init is at least dubious, IMO. > > > > Startup scripts has nothing to do with init(8), but this is the > > > > second-order question. > > > > > > Do you have a better idea of a place for them? This is the most > > > logical place I could think of. > > rc scripts are definitely not configuration files. They are executables. > > > > I proposed this several times, the /etc/rc.d and /etc/rc.* are very much > > wrong place to contain the scripts. For instance, /libexec/rc/ could be > > more logical and much more operationally correct: e.g. the scripts can > > be updated by make installworld (or some sub-target) and removed by the > > ObsoleteFiles. > > I agree with that, but was shot down as too big of a POLA violation on this > list back during BSDCan. > > I think it is something we can tackle, but I do not want it to hold up > pkgbase so I am not willing to merge the two projects. > > > Regards, > Brad Davis ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r336845 - in head: etc etc/defaults etc/rc.d sbin/init sbin/init/rc.d
On Sun, Jul 29, 2018, at 11:44 AM, Konstantin Belousov wrote: > On Sun, Jul 29, 2018 at 11:01:27AM -0600, Brad Davis wrote: > > On Sun, Jul 29, 2018, at 9:42 AM, Konstantin Belousov wrote: > > > On Sat, Jul 28, 2018 at 08:36:23PM +, Brad Davis wrote: > > > > Author: brd > > > > Date: Sat Jul 28 20:36:23 2018 > > > > New Revision: 336845 > > > > URL: https://svnweb.freebsd.org/changeset/base/336845 > > > > > > > > Log: > > > > Move rc startup scripts from etc/ to sbin/init/ > > > Why all these moves are useful ? > > > > > > No commit message explained what is the goal of the moves, and why > > > it is better that way comparing the existing src/etc collection. > > > > For pkg base we need to distill things out of etc/ and into places > > where they fit better. This enables them to be pkged up with the > > parts of the system them belong with and the CONFS= tags them as > > config files so that pkg will know about them and be able to 3-way > > merge them. This keeps the flexibility we have today with the many > > WITH_*/WITHOUT_* knobs. Though it is not without trade offs, keeping > > all of one part of the system together is simpler and makes some > > maintenance easier. > I do not see why do we need this for the pkgbase. There is nothing > wrong with installation of the whole clean dist-supplied /etc on > the fresh system. More, as you noted yourself, the ability to have > all the config files installed is simpler and allows to overview and > prepare configuration without requiring to have the corresponding > packages installed. On a fresh system sure, but on upgrades that is a problem. I was not advocating for having all the etc files installed, even when you do not have that pkg installed. I am saying it matches what happens today if you have, for example, WITHOUT_ACPI=y set. > > > Moving startup scripts to sbin/init is at least dubious, IMO. > > > Startup scripts has nothing to do with init(8), but this is the > > > second-order question. > > > > Do you have a better idea of a place for them? This is the most > > logical place I could think of. > rc scripts are definitely not configuration files. They are executables. > > I proposed this several times, the /etc/rc.d and /etc/rc.* are very much > wrong place to contain the scripts. For instance, /libexec/rc/ could be > more logical and much more operationally correct: e.g. the scripts can > be updated by make installworld (or some sub-target) and removed by the > ObsoleteFiles. I agree with that, but was shot down as too big of a POLA violation on this list back during BSDCan. I think it is something we can tackle, but I do not want it to hold up pkgbase so I am not willing to merge the two projects. Regards, Brad Davis ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r336845 - in head: etc etc/defaults etc/rc.d sbin/init sbin/init/rc.d
On Sun, Jul 29, 2018 at 11:01:27AM -0600, Brad Davis wrote: > On Sun, Jul 29, 2018, at 9:42 AM, Konstantin Belousov wrote: > > On Sat, Jul 28, 2018 at 08:36:23PM +, Brad Davis wrote: > > > Author: brd > > > Date: Sat Jul 28 20:36:23 2018 > > > New Revision: 336845 > > > URL: https://svnweb.freebsd.org/changeset/base/336845 > > > > > > Log: > > > Move rc startup scripts from etc/ to sbin/init/ > > Why all these moves are useful ? > > > > No commit message explained what is the goal of the moves, and why > > it is better that way comparing the existing src/etc collection. > > For pkg base we need to distill things out of etc/ and into places > where they fit better. This enables them to be pkged up with the > parts of the system them belong with and the CONFS= tags them as > config files so that pkg will know about them and be able to 3-way > merge them. This keeps the flexibility we have today with the many > WITH_*/WITHOUT_* knobs. Though it is not without trade offs, keeping > all of one part of the system together is simpler and makes some > maintenance easier. I do not see why do we need this for the pkgbase. There is nothing wrong with installation of the whole clean dist-supplied /etc on the fresh system. More, as you noted yourself, the ability to have all the config files installed is simpler and allows to overview and prepare configuration without requiring to have the corresponding packages installed. > > > Moving startup scripts to sbin/init is at least dubious, IMO. > > Startup scripts has nothing to do with init(8), but this is the > > second-order question. > > Do you have a better idea of a place for them? This is the most > logical place I could think of. rc scripts are definitely not configuration files. They are executables. I proposed this several times, the /etc/rc.d and /etc/rc.* are very much wrong place to contain the scripts. For instance, /libexec/rc/ could be more logical and much more operationally correct: e.g. the scripts can be updated by make installworld (or some sub-target) and removed by the ObsoleteFiles. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r336845 - in head: etc etc/defaults etc/rc.d sbin/init sbin/init/rc.d
On Sun, Jul 29, 2018, at 9:42 AM, Konstantin Belousov wrote: > On Sat, Jul 28, 2018 at 08:36:23PM +, Brad Davis wrote: > > Author: brd > > Date: Sat Jul 28 20:36:23 2018 > > New Revision: 336845 > > URL: https://svnweb.freebsd.org/changeset/base/336845 > > > > Log: > > Move rc startup scripts from etc/ to sbin/init/ > Why all these moves are useful ? > > No commit message explained what is the goal of the moves, and why > it is better that way comparing the existing src/etc collection. For pkg base we need to distill things out of etc/ and into places where they fit better. This enables them to be pkged up with the parts of the system them belong with and the CONFS= tags them as config files so that pkg will know about them and be able to 3-way merge them. This keeps the flexibility we have today with the many WITH_*/WITHOUT_* knobs. Though it is not without trade offs, keeping all of one part of the system together is simpler and makes some maintenance easier. > Moving startup scripts to sbin/init is at least dubious, IMO. > Startup scripts has nothing to do with init(8), but this is the > second-order question. Do you have a better idea of a place for them? This is the most logical place I could think of. Regards, Brad Davis ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r336845 - in head: etc etc/defaults etc/rc.d sbin/init sbin/init/rc.d
On Sat, Jul 28, 2018 at 08:36:23PM +, Brad Davis wrote: > Author: brd > Date: Sat Jul 28 20:36:23 2018 > New Revision: 336845 > URL: https://svnweb.freebsd.org/changeset/base/336845 > > Log: > Move rc startup scripts from etc/ to sbin/init/ Why all these moves are useful ? No commit message explained what is the goal of the moves, and why it is better that way comparing the existing src/etc collection. Moving startup scripts to sbin/init is at least dubious, IMO. Startup scripts has nothing to do with init(8), but this is the second-order question. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336845 - in head: etc etc/defaults etc/rc.d sbin/init sbin/init/rc.d
Author: brd Date: Sat Jul 28 20:36:23 2018 New Revision: 336845 URL: https://svnweb.freebsd.org/changeset/base/336845 Log: Move rc startup scripts from etc/ to sbin/init/ This keeps most startup scripts as CONFS per discussion on src-committers from back during BSDCan. Approved by: will (mentor) Differential Revision:https://reviews.freebsd.org/D16466 Added: head/sbin/init/rc.d/ - copied from r336844, head/etc/rc.d/ Deleted: head/etc/rc.d/ Modified: head/etc/Makefile head/etc/defaults/Makefile head/sbin/init/Makefile head/sbin/init/rc.d/Makefile Modified: head/etc/Makefile == --- head/etc/Makefile Sat Jul 28 20:33:08 2018(r336844) +++ head/etc/Makefile Sat Jul 28 20:36:23 2018(r336845) @@ -31,19 +31,14 @@ BIN1= crontab \ mac.conf \ motd \ netconfig \ - network.subr \ networks \ newsyslog.conf \ nsswitch.conf \ phones \ profile \ protocols \ - rc \ rc.bsdextended \ rc.firewall \ - rc.initdiskless \ - rc.shutdown \ - rc.subr \ remote \ rpc \ services \ @@ -144,9 +139,6 @@ BIN1+= csh.cshrc csh.login csh.logout BIN1+= regdomain.xml .endif -# -rwxr-xr-x root:wheel, for the new cron root:wheel -BIN2= netstart pccard_ether rc.suspend rc.resume - .if ${MK_SENDMAIL} == "no" ETCMAIL=mailer.conf aliases .else @@ -187,8 +179,6 @@ distribution: ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${BIN1} ${DESTDIR}/etc; \ cap_mkdb ${CAP_MKDB_ENDIAN} ${DESTDIR}/etc/login.conf; \ - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 755 \ - ${BIN2} ${DESTDIR}/etc; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \ master.passwd nsmb.conf opieaccess ${DESTDIR}/etc; @@ -235,7 +225,6 @@ distribution: .if ${MK_PKGBOOTSTRAP} != "no" ${_+_}cd ${.CURDIR}/pkg; ${MAKE} install .endif - ${_+_}cd ${.CURDIR}/rc.d; ${MAKE} install ${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap ${_+_}cd ${.CURDIR}/syslog.d; ${MAKE} install ${_+_}cd ${SRCTOP}/usr.sbin/rmt; ${MAKE} etc-rmt Modified: head/etc/defaults/Makefile == --- head/etc/defaults/Makefile Sat Jul 28 20:33:08 2018(r336844) +++ head/etc/defaults/Makefile Sat Jul 28 20:36:23 2018(r336845) @@ -2,7 +2,7 @@ .include -FILES= devfs.rules periodic.conf rc.conf +FILES= devfs.rules periodic.conf FILESDIR= /etc/defaults .if ${MK_BLUETOOTH} != "no" Modified: head/sbin/init/Makefile == --- head/sbin/init/Makefile Sat Jul 28 20:33:08 2018(r336844) +++ head/sbin/init/Makefile Sat Jul 28 20:36:23 2018(r336845) @@ -1,6 +1,15 @@ # @(#)Makefile8.1 (Berkeley) 7/19/93 # $FreeBSD$ +FILESGROUPS= FILESETC FILESETCEXEC FILESETCDEFAULTS +FILESETCDIR= /etc +FILESETC= network.subr rc rc.initdiskless rc.subr rc.shutdown +FILESETCMODE= 644 +FILESETCEXEC= netstart pccard_ether rc.resume rc.suspend +FILESETCEXECDIR= /etc +FILESETCEXECMODE= 755 +FILESETCDEFAULTSDIR= /etc/defaults +FILESETCDEFAULTS= rc.conf PACKAGE=runtime PROG= init SRCS= init.c getmntopts.c @@ -16,5 +25,7 @@ CFLAGS+=-I${MOUNT} .PATH: ${MOUNT} NO_SHARED?=YES + +SUBDIR+= rc.d .include Modified: head/sbin/init/rc.d/Makefile == --- head/etc/rc.d/Makefile Sat Jul 28 20:33:08 2018(r336844) +++ head/sbin/init/rc.d/MakefileSat Jul 28 20:36:23 2018 (r336845) @@ -2,10 +2,10 @@ .include -BINDIR=/etc/rc.d -FILESGROUPS= FILES +CONFSDIR= /etc/rc.d +CONFSGROUPS= CONFS -FILES= DAEMON \ +CONFS= DAEMON \ FILESYSTEMS \ LOGIN \ NETWORKING \ @@ -75,7 +75,6 @@ FILES=DAEMON \ netif \ netoptions \ netwait \ - newsyslog \ nfsclient \ nfscbd \ nfsd \ @@ -113,8 +112,6 @@ FILES= DAEMON \ stf \ swap \ swaplate \ - sysctl \ - syslogd \ tmp \ ${_ubthidhci} \ ugidfw \ @@ -123,7 +120,7 @@ FILES= DAEMON \ watchdogd .if ${MK_NIS} != "no" -FILES+=ypbind \ +CONFS+=ypbind \ ypldap \ yppasswdd \ ypserv \ @@ -133,29 +130,29 @@ FILES+= ypbind \ .endif .if ${MK_ACCT} != "no" -FILESGROUPS+= ACCT +CONFSGROUPS+= ACCT ACCT+= accounting ACCTPACKAGE= acct .endif .if ${MK_ACPI} != "no" -FILESGROUPS+= ACPI +CONFSGROUPS+= ACPI ACPI= power_profile ACPIPACKAGE= acpi .endif .if ${MK_ACPI} != "no" || ${MK_APM} != "no" -FILES+=