Re: Snapshot issue: panic: trap type 18, code=0
Almost certainly the same problem, retry when you have a newer snap. The list currently doesn't reject attachments, but please don't send a 740k image when a hundred bytes of text would do (and be easier for readers). -- Sent from a phone, apologies for poor formatting. On 16 September 2018 23:03:29 jungle Boogie wrote: Hi all, Snapshot from 14 September evening time was fine. I cannot boot the bsd.rd installer to upgrade on a real x64 machine. Other reports similar were regarding virtual box, but that's not the case for me. If the list accepts pictures, please see attached image. Thanks!
Re: Change to mailer.conf(5) man page
On Sun, Sep 16, 2018 at 05:49:58PM -0400, Matt Schwartz wrote: > Yes, the comment should go as it is superfluous. Let me know if you > decide you want the BUGS section after all and I will re-do the patch. thanks, but at this stage there's no need to resubmit a diff - i can tweak it based on any feedback. note that i'm not proposing to remove the comment wholesale - just the part which lists the path to the binary. jmc
Re: Change to mailer.conf(5) man page
Yes, the comment should go as it is superfluous. Let me know if you decide you want the BUGS section after all and I will re-do the patch. On Sun, Sep 16, 2018 at 5:44 PM Jason McIntyre wrote: > > On Sun, Sep 16, 2018 at 12:25:47PM +0200, Sebastian Benoit wrote: > > Jason McIntyre(j...@kerhand.co.uk) on 2018.09.16 07:17:24 +0100: > > > On Sat, Sep 15, 2018 at 09:42:47PM -0400, Matt Schwartz wrote: > > > > Damnit! I forgot one line. Please disregard the previous. Now all > > > > lines of mailer.conf(5) should reflect that sendmail is no longer in > > > > the default install. > > > > > > > > > > i'm ok with this, though the spacing on your diff got mangled and it > > > doesn;t apply. > > > > > > i'd be tempted to remove the text ", named > > > /usr/local/libexec/sendmail/sendmail" > > > > > > anyone want to ok (or commit with my ok)? > > > > ok benno@ > > > > possible further improvements: > > > > * maybe we should mention that sendmail is a package that needs tobe > > installed? I dont know if we do that in manpages usually? > > > > i thought about changing the comment (Execute the real sendmail...) from > naming the path to naming the package, but i don;t like it. i still want > to trim that comment, since speciying that path, then relisting it 5 > times seems unneccessary. > > we could add some (separate) text about adding sendmail as a package. i'm not > sure > if that would be helpful or not. > > > * the BUGS section can go away i think, its wishfull thinking because > > these program names are the defacto standard. > > > > i'm ok with removing that idea, but the man point of the entry seems to > be that having a need for this file is a bug in itself. shouldn;t we retain > the removal > of this system as a goal? > > jmc > > > > > > jmc > > > > > > > Index: mailer.conf.5 > > > > === > > > > RCS file: /cvs/src/usr.sbin/mailwrapper/mailer.conf.5,v > > > > retrieving revision 1.17 > > > > diff -u -p -u -r1.17 mailer.conf.5 > > > > --- mailer.conf.5 8 Dec 2015 09:06:32 - 1.17 > > > > +++ mailer.conf.5 16 Sep 2018 01:41:53 - > > > > @@ -78,14 +78,14 @@ This example shows how to invoke the tra > > > > MTA suite in place of > > > > .Xr smtpd 8 . > > > > .Bd -literal > > > > -# Execute the "real" sendmail program, named > > > > /usr/libexec/sendmail/sendmail > > > > -sendmail /usr/libexec/sendmail/sendmail > > > > -send-mail /usr/libexec/sendmail/sendmail > > > > -mailq /usr/libexec/sendmail/sendmail > > > > -makemap/usr/libexec/sendmail/makemap > > > > -newaliases /usr/libexec/sendmail/sendmail > > > > -hoststat /usr/libexec/sendmail/sendmail > > > > -purgestat /usr/libexec/sendmail/sendmail > > > > +# Execute the "real" sendmail program, named > > > > /usr/local/libexec/sendmail/sendmail > > > > +sendmail /usr/local/libexec/sendmail/sendmail > > > > +send-mail /usr/local/libexec/sendmail/sendmail > > > > +mailq /usr/local/libexec/sendmail/sendmail > > > > +makemap/usr/local/libexec/sendmail/makemap > > > > +newaliases /usr/local/libexec/sendmail/sendmail > > > > +hoststat /usr/local/libexec/sendmail/sendmail > > > > +purgestat /usr/local/libexec/sendmail/sendmail > > > > .Ed > > > > .Sh SEE ALSO > > > > .Xr mail 1 , > > > > > > > > On Sat, Sep 15, 2018 at 9:36 PM Matt Schwartz > > > > wrote: > > > > > > > > > > Quick correction to the mailer.conf(5) man page. Since sendmail is no > > > > > longer in the default install, the man page has been corrected to > > > > > reflect that the sendmail binary would be in > > > > > /usr/local/libexec/sendmail instead of /usr/libexec/sendmail. > > > > > > > > > > Index: mailer.conf.5 > > > > > === > > > > > RCS file: /cvs/src/usr.sbin/mailwrapper/mailer.conf.5,v > > > > > retrieving revision 1.17 > > > > > diff -u -p -u -r1.17 mailer.conf.5 > > > > > --- mailer.conf.5 8 Dec 2015 09:06:32 - 1.17 > > > > > +++ mailer.conf.5 16 Sep 2018 01:34:31 - > > > > > @@ -79,13 +79,13 @@ MTA suite in place of > > > > > .Xr smtpd 8 . > > > > > .Bd -literal > > > > > # Execute the "real" sendmail program, named > > > > > /usr/libexec/sendmail/sendmail > > > > > -sendmail /usr/libexec/sendmail/sendmail > > > > > -send-mail /usr/libexec/sendmail/sendmail > > > > > -mailq /usr/libexec/sendmail/sendmail > > > > > -makemap/usr/libexec/sendmail/makemap > > > > > -newaliases /usr/libexec/sendmail/sendmail > > > > > -hoststat /usr/libexec/sendmail/sendmail > > > > > -purgestat /usr/libexec/sendmail/sendmail > > > > > +sendmail /usr/local/libexec/sendmail/sendmail > > > > > +send-mail /usr/local/libexec/sendmail/sendmail > > > > > +mailq /usr/local/libexec/sendmail/sendmail > > > > > +makemap/usr/local/libexec/sendmail/makemap > > > > > +newaliases
Re: fdformat: reformat usage()
On Wed, Sep 12, 2018 at 05:40:49PM +0100, Jason McIntyre wrote:
> On Wed, Sep 12, 2018 at 11:50:18AM +0200, Sascha Paunovic wrote:
> > Since C99, string literal concatenation is provided, allowing the number
> > of printf() calls to be greatly reduced (20 -> 1).
> >
> > This is my first diff I'm sending, feedback would be very appreciated.
> >
>
> hi.
>
> i'm all for the diff but... generally usage() does not spit out a
> description of the options (with some exceptions). if you look at the
> man page, the irony is that the usage seems more verbose.
>
> anyone object to removing the list that follows the synopsis? if not,
> i'd prefer that.
>
> unrelated question: anyone know why the argument to -g is "gap3len"?
>
> jmc
>
ok, so here's the diff i propose. yay? nay?
jmc
Index: fdformat.c
===
RCS file: /cvs/src/usr.sbin/fdformat/fdformat.c,v
retrieving revision 1.22
diff -u -r1.22 fdformat.c
--- fdformat.c 16 Mar 2016 15:41:11 - 1.22
+++ fdformat.c 16 Sep 2018 21:46:04 -
@@ -132,26 +132,10 @@
static void
usage(void)
{
- printf("usage: %s [-nqv] [-c cyls] [-F fillbyte] [-g gap3len] ",
- __progname);
- printf("[-h heads]\n");
- printf("\t[-i intleave] [-r rate] [-S secshft] [-s secs]\n");
- printf("\t[-t steps_per_track] device_name\n");
- printf("Options:\n");
- printf("\t-n\tdon't verify floppy after formatting\n");
- printf("\t-q\tsuppress any normal output, don't ask for
confirmation\n");
- printf("\t-v\tdon't format, verify only\n");
- printf("\tdevname\tthe full name of floppy device or in short form fd0,
fd1\n");
- printf("Obscure options:\n");
- printf("\t-c #\tspecify number of cylinders, 40 or 80\n");
- printf("\t-F #\tspecify fill byte\n");
- printf("\t-g #\tspecify gap length\n");
- printf("\t-h #\tspecify number of floppy heads, 1 or 2\n");
- printf("\t-i #\tspecify interleave factor\n");
- printf("\t-r #\tspecify data rate, 250, 300 or 500 kbps\n");
- printf("\t-S #\tspecify sector size, 0=128, 1=256, 2=512 bytes\n");
- printf("\t-s #\tspecify number of sectors per track, 9, 10, 15 or
18\n");
- printf("\t-t #\tnumber of steps per track\n");
+ printf("usage: %s [-nqv] [-c cyls] [-F fillbyte] [-g gap3len] "
+ "[-h heads]\n"
+ " [-i intleave] [-r rate] [-S secshft] [-s secs]\n"
+ " [-t steps_per_track] device_name\n", __progname);
exit(2);
}
Re: Change to mailer.conf(5) man page
On Sun, Sep 16, 2018 at 12:25:47PM +0200, Sebastian Benoit wrote: > Jason McIntyre(j...@kerhand.co.uk) on 2018.09.16 07:17:24 +0100: > > On Sat, Sep 15, 2018 at 09:42:47PM -0400, Matt Schwartz wrote: > > > Damnit! I forgot one line. Please disregard the previous. Now all > > > lines of mailer.conf(5) should reflect that sendmail is no longer in > > > the default install. > > > > > > > i'm ok with this, though the spacing on your diff got mangled and it > > doesn;t apply. > > > > i'd be tempted to remove the text ", named > > /usr/local/libexec/sendmail/sendmail" > > > > anyone want to ok (or commit with my ok)? > > ok benno@ > > possible further improvements: > > * maybe we should mention that sendmail is a package that needs tobe > installed? I dont know if we do that in manpages usually? > i thought about changing the comment (Execute the real sendmail...) from naming the path to naming the package, but i don;t like it. i still want to trim that comment, since speciying that path, then relisting it 5 times seems unneccessary. we could add some (separate) text about adding sendmail as a package. i'm not sure if that would be helpful or not. > * the BUGS section can go away i think, its wishfull thinking because > these program names are the defacto standard. > i'm ok with removing that idea, but the man point of the entry seems to be that having a need for this file is a bug in itself. shouldn;t we retain the removal of this system as a goal? jmc > > > jmc > > > > > Index: mailer.conf.5 > > > === > > > RCS file: /cvs/src/usr.sbin/mailwrapper/mailer.conf.5,v > > > retrieving revision 1.17 > > > diff -u -p -u -r1.17 mailer.conf.5 > > > --- mailer.conf.5 8 Dec 2015 09:06:32 - 1.17 > > > +++ mailer.conf.5 16 Sep 2018 01:41:53 - > > > @@ -78,14 +78,14 @@ This example shows how to invoke the tra > > > MTA suite in place of > > > .Xr smtpd 8 . > > > .Bd -literal > > > -# Execute the "real" sendmail program, named > > > /usr/libexec/sendmail/sendmail > > > -sendmail /usr/libexec/sendmail/sendmail > > > -send-mail /usr/libexec/sendmail/sendmail > > > -mailq /usr/libexec/sendmail/sendmail > > > -makemap/usr/libexec/sendmail/makemap > > > -newaliases /usr/libexec/sendmail/sendmail > > > -hoststat /usr/libexec/sendmail/sendmail > > > -purgestat /usr/libexec/sendmail/sendmail > > > +# Execute the "real" sendmail program, named > > > /usr/local/libexec/sendmail/sendmail > > > +sendmail /usr/local/libexec/sendmail/sendmail > > > +send-mail /usr/local/libexec/sendmail/sendmail > > > +mailq /usr/local/libexec/sendmail/sendmail > > > +makemap/usr/local/libexec/sendmail/makemap > > > +newaliases /usr/local/libexec/sendmail/sendmail > > > +hoststat /usr/local/libexec/sendmail/sendmail > > > +purgestat /usr/local/libexec/sendmail/sendmail > > > .Ed > > > .Sh SEE ALSO > > > .Xr mail 1 , > > > > > > On Sat, Sep 15, 2018 at 9:36 PM Matt Schwartz > > > wrote: > > > > > > > > Quick correction to the mailer.conf(5) man page. Since sendmail is no > > > > longer in the default install, the man page has been corrected to > > > > reflect that the sendmail binary would be in > > > > /usr/local/libexec/sendmail instead of /usr/libexec/sendmail. > > > > > > > > Index: mailer.conf.5 > > > > === > > > > RCS file: /cvs/src/usr.sbin/mailwrapper/mailer.conf.5,v > > > > retrieving revision 1.17 > > > > diff -u -p -u -r1.17 mailer.conf.5 > > > > --- mailer.conf.5 8 Dec 2015 09:06:32 - 1.17 > > > > +++ mailer.conf.5 16 Sep 2018 01:34:31 - > > > > @@ -79,13 +79,13 @@ MTA suite in place of > > > > .Xr smtpd 8 . > > > > .Bd -literal > > > > # Execute the "real" sendmail program, named > > > > /usr/libexec/sendmail/sendmail > > > > -sendmail /usr/libexec/sendmail/sendmail > > > > -send-mail /usr/libexec/sendmail/sendmail > > > > -mailq /usr/libexec/sendmail/sendmail > > > > -makemap/usr/libexec/sendmail/makemap > > > > -newaliases /usr/libexec/sendmail/sendmail > > > > -hoststat /usr/libexec/sendmail/sendmail > > > > -purgestat /usr/libexec/sendmail/sendmail > > > > +sendmail /usr/local/libexec/sendmail/sendmail > > > > +send-mail /usr/local/libexec/sendmail/sendmail > > > > +mailq /usr/local/libexec/sendmail/sendmail > > > > +makemap/usr/local/libexec/sendmail/makemap > > > > +newaliases /usr/local/libexec/sendmail/sendmail > > > > +hoststat /usr/local/libexec/sendmail/sendmail > > > > +purgestat /usr/local/libexec/sendmail/sendmail > > > > .Ed > > > > .Sh SEE ALSO > > > > .Xr mail 1 , > > > > > >
Re: bsd.rd failure in VirtualBox
On 2018/09/16 10:52, David Higgs wrote: > On Sun, Sep 16, 2018 at 10:17 AM, David Higgs wrote: >> On Sat, Sep 15, 2018 at 10:05 PM, Philip Guenther wrote: >>> On Sat, Sep 15, 2018 at 11:59 AM David Higgs wrote: I often use VirtualBox (version 5.2.18 on OS X) to familiarize myself with new features in snapshots, before upgrading my physical hardware. This afternoon, I tried updating bsd.rd (amd64, 6.4-beta RAMDISK_CD #281) and wasn't able to successfully boot it. I had to rely on the video capture ability of VirtualBox to even notice there was a panic (typed out below) before it rebooted to the "BIOS" splash screen. >>> >>> ... Also attached is the dmesg from a prior working snapshot. I haven't tried updating since this prior snapshot, so I don't have further insight into when the issue first appeared. >>> >>> >>> Thank you for the complete and clear report! >>> >>> I have a diff in the amd64 snapshots to use the CPU's PCID support in many >>> cases and this VirtualBox setup found a bug in it. I've generated a new >>> diff that should fix this, so a future snap should fix this, though when >>> that'll happend depends on the snap builder's schedule. >>> >> >> Not sure if the fix made it into RAMDISK_CD #282, but this panic is >> slightly different. I haven't tried reproducing to see if the panic >> message differs between boots. >> >> >> root on rd0a swap on rd0b dump on rd0b >> uvm_fault(0xff011f73ac60, 0x208, 0, 1) -> e >> fatal page fault in supervisor mode >> trap type 6 code 0 rip 8135510b cs 8 rflags 10246 cr2 208 cpl >> 0 rsp 800022026c90 >> gsbase 0x81870ff0 kgsbase 0x0 >> panic: trap type 6, code=0, pc=8135510b >> syncing disk... done >> >> dump to dev 17,1 not possible >> rebooting... >> >> >> Hope this helps. >> > > FWIW, the vbox capture feature is pretty buggy - it doesn't create the > file when it says it is recording, and it frequently crashes. It is > possible the panic above is from #281 instead, because I deleted the > video before I realizing this. > > Below is definitely from #282. > > > Welcome to the OpenBSD/amd64 6.4 installation program. > fatal protection fault in supervisor mode > trap type 4 code 0 rip 810f4244 cs 8 rflags 10286 cr2 6c1fed > cpl a rsp 800022098800 > gsbase 0x81870ff0 kgsbase 0x0 > panic: trap type 4, code 0, pc=0x 810f4244 > syncing disks... done > > dump to dev 17,1 not possible > rebooting... > > > Hope this is actually useful and not another stupid VirtualBox bug. I see this an almost identical panic on real hardware too, the only difference being the string after 'rsp' Welcome to the OpenBSD/amd64 6.4 installation program. fatal protection fault in supervisor mode trap type 4 code 0 rip 810f4244 cs 8 rflags 10286 cr2 6c1fed cpl a rsp 8000220ba9e0 gsbase 0x81870ff0 kgsbase 0x0 panic: trap type 4, code 0, pc=810f4244 syncing disks... done dump to dev 17,1 not possible rebooting... Below is first the working dmesg snapshot, and then one from booting bsd.rd, note the ACPI error about not being able to load tables, that's not there on the working snap. That might be the culprit at least in my case? thanks, .jh dmesg from the working snapshot: OpenBSD 6.3-current (GENERIC.MP) #180: Fri Aug 3 20:53:10 MDT 2018 dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP real mem = 16838430720 (16058MB) avail mem = 16318918656 (15562MB) mpath0 at root scsibus0 at mpath0: 256 targets mainbus0 at root bios0 at mainbus0: SMBIOS rev. 2.8 @ 0xec820 (29 entries) bios0: vendor American Megatrends Inc. version "P2.10" date 05/12/2015 bios0: ASRock Z97 Extreme4 acpi0 at bios0: rev 2 acpi0: sleep states S0 S3 S4 S5 acpi0: tables DSDT FACP APIC FPDT SSDT SSDT SSDT MCFG HPET SSDT SSDT AAFT UEFI acpi0: wakeup devices PEGP(S4) PEG0(S4) PEGP(S4) PEG1(S4) PEGP(S4) PEG2(S4) PS2K(S4) UAR1(S4) USB1(S3) PXSX(S4) RP01(S4) PXSX(S4) PXSX(S4) PXSX(S4) RP04(S4) PXSX(S4) [...] acpitimer0 at acpi0: 3579545 Hz, 24 bits acpimadt0 at acpi0 addr 0xfee0: PC-AT compat cpu0 at mainbus0: apid 0 (boot processor) cpu0: Intel(R) Pentium(R) CPU G3258 @ 3.20GHz, 3199.54 MHz cpu0: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,SDBG,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,MOVBE,POPCNT,DEADLINE,XSAVE,RDRAND,NXE,PAGE1GB,RDTSCP,LONG,LAHF,ABM,PERF,ITSC,FSGSBASE,ERMS,INVPCID,IBRS,IBPB,STIBP,SENSOR,ARAT,XSAVEOPT,MELTDOWN cpu0: 256KB 64b/line 8-way L2 cache cpu0: smt 0, core 0, package 0 mtrr: Pentium Pro MTRR support, 10 var ranges, 88 fixed ranges cpu0: apic clock running at 99MHz cpu0: mwait min=64, max=64, C-substates=0.2.1.2, IBE cpu1 at mainbus0: apid 2 (application processor) cpu1: Intel(R) Pentium(R) CPU G3258 @ 3.20GHz, 3199.08 MHz cpu1:
Re: bsd.rd failure in VirtualBox
On Sat, Sep 15, 2018 at 10:05 PM, Philip Guenther wrote: > On Sat, Sep 15, 2018 at 11:59 AM David Higgs wrote: >> >> I often use VirtualBox (version 5.2.18 on OS X) to familiarize myself >> with new features in snapshots, before upgrading my physical hardware. >> >> This afternoon, I tried updating bsd.rd (amd64, 6.4-beta RAMDISK_CD >> #281) and wasn't able to successfully boot it. I had to rely on the >> video capture ability of VirtualBox to even notice there was a panic >> (typed out below) before it rebooted to the "BIOS" splash screen. > > ... >> >> Also attached is the dmesg from a prior working snapshot. I haven't >> tried updating since this prior snapshot, so I don't have further >> insight into when the issue first appeared. > > > Thank you for the complete and clear report! > > I have a diff in the amd64 snapshots to use the CPU's PCID support in many > cases and this VirtualBox setup found a bug in it. I've generated a new > diff that should fix this, so a future snap should fix this, though when > that'll happend depends on the snap builder's schedule. > Not sure if the fix made it into RAMDISK_CD #282, but this panic is slightly different. I haven't tried reproducing to see if the panic message differs between boots. root on rd0a swap on rd0b dump on rd0b uvm_fault(0xff011f73ac60, 0x208, 0, 1) -> e fatal page fault in supervisor mode trap type 6 code 0 rip 8135510b cs 8 rflags 10246 cr2 208 cpl 0 rsp 800022026c90 gsbase 0x81870ff0 kgsbase 0x0 panic: trap type 6, code=0, pc=8135510b syncing disk... done dump to dev 17,1 not possible rebooting... Hope this helps. --david
Re: Change to mailer.conf(5) man page
I am not sure how the patch got mangled but below reflects the suggested changes - sorry for the noise. BUGS section removed and I made a note to install sendmail via ports. Index: mailer.conf.5 === RCS file: /cvs/src/usr.sbin/mailwrapper/mailer.conf.5,v retrieving revision 1.17 diff -u -p -u -r1.17 mailer.conf.5 --- mailer.conf.58 Dec 2015 09:06:32 -1.17 +++ mailer.conf.516 Sep 2018 12:06:45 - @@ -76,16 +76,18 @@ newaliases/usr/sbin/smtpctl This example shows how to invoke the traditional .Xr sendmail 8 MTA suite in place of -.Xr smtpd 8 . +.Xr smtpd 8 . You will need to install sendmail from ports since it +is no longer in base. .Bd -literal -# Execute the "real" sendmail program, named /usr/libexec/sendmail/sendmail -sendmail/usr/libexec/sendmail/sendmail -send-mail/usr/libexec/sendmail/sendmail -mailq/usr/libexec/sendmail/sendmail -makemap /usr/libexec/sendmail/makemap -newaliases/usr/libexec/sendmail/sendmail -hoststat/usr/libexec/sendmail/sendmail -purgestat/usr/libexec/sendmail/sendmail +# Execute the real sendmail program located in +# /usr/local/libexec/sendmail/sendmail +sendmail/usr/local/libexec/sendmail/sendmail +send-mail/usr/local/libexec/sendmail/sendmail +mailq/usr/local/libexec/sendmail/sendmail +makemap /usr/local/libexec/sendmail/makemap +newaliases/usr/local//sendmail/sendmail +hoststat/usr/local/sendmail/sendmail +purgestat/usr/local/sendmail/sendmail .Ed .Sh SEE ALSO .Xr mail 1 , @@ -95,10 +97,3 @@ purgestat/usr/libexec/sendmail/sendmail .Xr smtpd 8 .Sh AUTHORS .An Perry E. Metzger Aq Mt pe...@piermont.com -.Sh BUGS -The entire reason this program exists is a crock. -Instead, a command for how to submit mail should be standardized, -and all the "behave differently if invoked with a different name" -behavior of things like -.Xr mailq 8 -should go away. On Sun, Sep 16, 2018 at 6:28 AM Sebastian Benoit wrote: > > Jason McIntyre(j...@kerhand.co.uk) on 2018.09.16 07:17:24 +0100: > > On Sat, Sep 15, 2018 at 09:42:47PM -0400, Matt Schwartz wrote: > > > Damnit! I forgot one line. Please disregard the previous. Now all > > > lines of mailer.conf(5) should reflect that sendmail is no longer in > > > the default install. > > > > > > > i'm ok with this, though the spacing on your diff got mangled and it > > doesn;t apply. > > > > i'd be tempted to remove the text ", named > > /usr/local/libexec/sendmail/sendmail" > > > > anyone want to ok (or commit with my ok)? > > ok benno@ > > possible further improvements: > > * maybe we should mention that sendmail is a package that needs tobe > installed? I dont know if we do that in manpages usually? > > * the BUGS section can go away i think, its wishfull thinking because > these program names are the defacto standard. > > > > jmc > > > > > Index: mailer.conf.5 > > > === > > > RCS file: /cvs/src/usr.sbin/mailwrapper/mailer.conf.5,v > > > retrieving revision 1.17 > > > diff -u -p -u -r1.17 mailer.conf.5 > > > --- mailer.conf.5 8 Dec 2015 09:06:32 - 1.17 > > > +++ mailer.conf.5 16 Sep 2018 01:41:53 - > > > @@ -78,14 +78,14 @@ This example shows how to invoke the tra > > > MTA suite in place of > > > .Xr smtpd 8 . > > > .Bd -literal > > > -# Execute the "real" sendmail program, named > > > /usr/libexec/sendmail/sendmail > > > -sendmail /usr/libexec/sendmail/sendmail > > > -send-mail /usr/libexec/sendmail/sendmail > > > -mailq /usr/libexec/sendmail/sendmail > > > -makemap/usr/libexec/sendmail/makemap > > > -newaliases /usr/libexec/sendmail/sendmail > > > -hoststat /usr/libexec/sendmail/sendmail > > > -purgestat /usr/libexec/sendmail/sendmail > > > +# Execute the "real" sendmail program, named > > > /usr/local/libexec/sendmail/sendmail > > > +sendmail /usr/local/libexec/sendmail/sendmail > > > +send-mail /usr/local/libexec/sendmail/sendmail > > > +mailq /usr/local/libexec/sendmail/sendmail > > > +makemap/usr/local/libexec/sendmail/makemap > > > +newaliases /usr/local/libexec/sendmail/sendmail > > > +hoststat /usr/local/libexec/sendmail/sendmail > > > +purgestat /usr/local/libexec/sendmail/sendmail > > > .Ed > > > .Sh SEE ALSO > > > .Xr mail 1 , > > > > > > On Sat, Sep 15, 2018 at 9:36 PM Matt Schwartz wrote: > > > > > > > > Quick correction to the mailer.conf(5) man page. Since sendmail is no > > > > longer in the default install, the man page has been corrected to > > > > reflect that the sendmail binary would be in > > > > /usr/local/libexec/sendmail instead of /usr/libexec/sendmail. > > > > > > > > Index: mailer.conf.5 > > > > === > > > > RCS file: /cvs/src/usr.sbin/mailwrapper/mailer.conf.5,v > > > > retrieving revision 1.17 > > > > diff -u -p
(patch) reduce confusion with absolute pathnames in vnconfig
Hello, this is my first patch.
vnconfig(8) should print absolute pathnames of configured disk images,
instead of repeating whatever was given to -c.
Contrived example:
$ doas vnconfig -l
vnd0: covering ../images/../images/foo on sd4l, inode 15301672
vnd1: covering foo on sd4l, inode 15562887
vnd2: covering foo on sd4l, inode 15562888
With this patch:
$ doas vnconfig -l
vnd0: covering /home/user/images/foo on sd4l, inode 15301672
vnd1: covering /home/user/images/a/foo on sd4l, inode 15562887
vnd2: covering /home/user/images/b/foo on sd4l, inode 15562888
Index: mount_vnd.c
===
RCS file: /cvs/src/sbin/mount_vnd/mount_vnd.c,v
retrieving revision 1.20
diff -u -p -r1.20 mount_vnd.c
--- mount_vnd.c 24 Jan 2016 06:32:33 - 1.20
+++ mount_vnd.c 16 Sep 2018 06:05:02 -
@@ -143,6 +143,7 @@ main(int argc, char **argv)
if (action == VND_CONFIG && argc == 2) {
int ind_raw, ind_reg;
+ char realfile[PATH_MAX];
if (opt_k || opt_K) {
fprintf(stderr,
@@ -167,7 +168,12 @@ main(int argc, char **argv)
ind_raw = 0;
ind_reg = 1;
}
- rv = config(argv[ind_raw], argv[ind_reg], action, dp, key,
+
+ if (realpath(argv[ind_reg], realfile) == NULL) {
+ err(1, "invalid file path");
+ }
+
+ rv = config(argv[ind_raw], realfile, action, dp, key,
keylen);
} else if (action == VND_UNCONFIG && argc == 1)
rv = config(argv[0], NULL, action, NULL, NULL, 0);
Re: Change to mailer.conf(5) man page
On Sat, Sep 15, 2018 at 09:42:47PM -0400, Matt Schwartz wrote: > Damnit! I forgot one line. Please disregard the previous. Now all > lines of mailer.conf(5) should reflect that sendmail is no longer in > the default install. > i'm ok with this, though the spacing on your diff got mangled and it doesn;t apply. i'd be tempted to remove the text ", named /usr/local/libexec/sendmail/sendmail" anyone want to ok (or commit with my ok)? jmc > Index: mailer.conf.5 > === > RCS file: /cvs/src/usr.sbin/mailwrapper/mailer.conf.5,v > retrieving revision 1.17 > diff -u -p -u -r1.17 mailer.conf.5 > --- mailer.conf.5 8 Dec 2015 09:06:32 - 1.17 > +++ mailer.conf.5 16 Sep 2018 01:41:53 - > @@ -78,14 +78,14 @@ This example shows how to invoke the tra > MTA suite in place of > .Xr smtpd 8 . > .Bd -literal > -# Execute the "real" sendmail program, named /usr/libexec/sendmail/sendmail > -sendmail /usr/libexec/sendmail/sendmail > -send-mail /usr/libexec/sendmail/sendmail > -mailq /usr/libexec/sendmail/sendmail > -makemap/usr/libexec/sendmail/makemap > -newaliases /usr/libexec/sendmail/sendmail > -hoststat /usr/libexec/sendmail/sendmail > -purgestat /usr/libexec/sendmail/sendmail > +# Execute the "real" sendmail program, named > /usr/local/libexec/sendmail/sendmail > +sendmail /usr/local/libexec/sendmail/sendmail > +send-mail /usr/local/libexec/sendmail/sendmail > +mailq /usr/local/libexec/sendmail/sendmail > +makemap/usr/local/libexec/sendmail/makemap > +newaliases /usr/local/libexec/sendmail/sendmail > +hoststat /usr/local/libexec/sendmail/sendmail > +purgestat /usr/local/libexec/sendmail/sendmail > .Ed > .Sh SEE ALSO > .Xr mail 1 , > > On Sat, Sep 15, 2018 at 9:36 PM Matt Schwartz > wrote: > > > > Quick correction to the mailer.conf(5) man page. Since sendmail is no > > longer in the default install, the man page has been corrected to > > reflect that the sendmail binary would be in > > /usr/local/libexec/sendmail instead of /usr/libexec/sendmail. > > > > Index: mailer.conf.5 > > === > > RCS file: /cvs/src/usr.sbin/mailwrapper/mailer.conf.5,v > > retrieving revision 1.17 > > diff -u -p -u -r1.17 mailer.conf.5 > > --- mailer.conf.5 8 Dec 2015 09:06:32 - 1.17 > > +++ mailer.conf.5 16 Sep 2018 01:34:31 - > > @@ -79,13 +79,13 @@ MTA suite in place of > > .Xr smtpd 8 . > > .Bd -literal > > # Execute the "real" sendmail program, named /usr/libexec/sendmail/sendmail > > -sendmail /usr/libexec/sendmail/sendmail > > -send-mail /usr/libexec/sendmail/sendmail > > -mailq /usr/libexec/sendmail/sendmail > > -makemap/usr/libexec/sendmail/makemap > > -newaliases /usr/libexec/sendmail/sendmail > > -hoststat /usr/libexec/sendmail/sendmail > > -purgestat /usr/libexec/sendmail/sendmail > > +sendmail /usr/local/libexec/sendmail/sendmail > > +send-mail /usr/local/libexec/sendmail/sendmail > > +mailq /usr/local/libexec/sendmail/sendmail > > +makemap/usr/local/libexec/sendmail/makemap > > +newaliases /usr/local/libexec/sendmail/sendmail > > +hoststat /usr/local/libexec/sendmail/sendmail > > +purgestat /usr/local/libexec/sendmail/sendmail > > .Ed > > .Sh SEE ALSO > > .Xr mail 1 , >
