On Thu, Feb 25, 2016 at 07:56:54PM -0700, Theo de Raadt wrote: > Chris, you continue to amaze me. > > Upon running sysmerge, that will break everyone's setup. > > Like, can you try stuff before you send it out? > > I'm done. > > > /etc/examples/printcap doesn't match > > #define _PATH_DEFSPOOL "/var/spool/output/lpd" > > > > Which seems sensible to keep lpd jobs out of output directory > > > > Index: printcap > > =================================================================== > > RCS file: /cvs/src/etc/examples/printcap,v > > retrieving revision 1.1 > > diff -u -p -r1.1 printcap > > --- printcap 12 Jul 2014 03:52:39 -0000 1.1 > > +++ printcap 25 Feb 2016 20:53:56 -0000 > > @@ -1,7 +1,7 @@ > > # $OpenBSD: printcap,v 1.1 2014/07/12 03:52:39 deraadt Exp $ > > > > #lp|local line printer:\ > > -# :lp=/dev/lp:sd=/var/spool/output:lf=/var/log/lpd-errs: > > +# :lp=/dev/lp:sd=/var/spool/output/lpd:lf=/var/log/lpd-errs: > > > > #rp|remote line printer:\ > > -# :lp=:rm=printhost:rp=lp:sd=/var/spool/output:lf=/var/log/lpd-errs: > > +# :lp=:rm=printhost:rp=lp:sd=/var/spool/output/lpd:lf=/var/log/lpd-errs: > > > > OK? > > > > Chris > > >
I did not realize that sysmerge did a checksum on the files in /etc/examples. What else needs to be changed to make my change acceptable? I base my change both on the different directories in the lpd/lpr code and the fact that some packages, such as apsfilter create an lpd subdirectory also with another subdirectory for each printer to keep the print queue files destinations clear rather than all bunched together. Another option is to change the lpd/lpr code to match the /etc/examples/printcap file. The last option I see is to do nothing and leave things as-is. Thanks, Chris
