Re: boot loader blank screen

Op ma 4 jan. 2021 om 23:59 schreef Toomas Soome : > the 58661b3ba9eb should hopefully fix the loader text mode issue, it would be > cool if you can verify:) No, sorry... On Tue, Jan 05, 2021 at 02:58:02AM +0100, Idwer Vollering wrote: > I had more success with this patch, applied on top of 7be

Re: boot loader blank screen

> On 4. Jan 2021, at 18:30, Toomas Soome wrote: > > > >> On 4. Jan 2021, at 18:22, John Kennedy wrote: >> >> This is a little weird. >> >> Somewhere between 13.0-g2ff66a915526 (Dec 30th) and -gd03fd8ede2c4 (Dec >> 29th), >> I've lost the screen in the boot loader. This is really weird be

Re: boot loader blank screen

Toomas, I had more success with this patch, applied on top of 7beeacb27b27 (in other words: call vbe_is_vga() from cons_update_mode() instead of vidc_install_font() ): diff --git a/stand/i386/libi386/vbe.c b/stand/i386/libi386/vbe.c index 7681eb633b8..1fee4f040f4 100644 --- a/stand/i386/libi386/v

Re: HEADS UP: FreeBSD src repo transitioning to git this weekend

Typo: On Mon, Jan 4, 2021 at 5:25 PM Conrad Meyer wrote: > SHA1 has always, by design, been vulnerable to a 2^80 resource attack :-). 2^160 for a specific hash. 2^80 if you're just trying to find any collision. ___ freebsd-current@freebsd.org mailing

Re: HEADS UP: FreeBSD src repo transitioning to git this weekend

On Mon, Jan 4, 2021 at 1:44 PM Ryan Stone wrote: > FWIW, a coworker of mine had a little hobby of introducing commits > into our internal repro that had hashes that all started with > deadc0de. As I understand it, it was able to do this by adding an > bogus attribute with the right value to the c

Re: HEADS UP: FreeBSD src repo transitioning to git this weekend

On Mon, Jan 4, 2021 at 3:44 PM Poul-Henning Kamp wrote: > Shattered is less impressive when you take into account that you > can stuff as much much garbage into a PDF file as you need, without > affecting the files normal function. > > Compact data formats, formats which leave no wiggle-room and d

Re: HEADS UP: FreeBSD src repo transitioning to git this weekend

John-Mark Gurney writes: > SHAttered[1] (2017) created two valid PDF documents which had the same > SHA-1 hash. The issue was that they were able to choose the entire > document. Shattered is less impressive when you take into account that you can stuff as much much garbage into a PDF f

Re: boot loader blank screen

> On 4. Jan 2021, at 18:22, John Kennedy wrote: > > This is a little weird. > > Somewhere between 13.0-g2ff66a915526 (Dec 30th) and -gd03fd8ede2c4 (Dec 29th), > I've lost the screen in the boot loader. This is really weird because I > didn't update the boot loader (in quite a while, actually)

Re: CURRENT, usr/src on git, howto "mergemaster"?

David Wolfskill david at catwhisker.org wrote on Mon Jan 4 12:29:45 UTC 2021 : > After trying to use mergemaster for a couple of weeks (after the switch > to sources from git, vs. svn) of daily tracking of head & stable/12 on a > pair of machines (and weekly tracking of stable/12 on another 4), I

RE: CURRENT, usr/src on git, howto "mergemaster"?

> -Original Message- > From: owner-freebsd-curr...@freebsd.org curr...@freebsd.org> On Behalf Of Michal Meloun > Sent: Monday, 4 January 2021 20:47 > To: freebsd-current@freebsd.org > Subject: Re: CURRENT, usr/src on git, howto "mergemaster"? > > > > On 04.01.2021 19:59, Steve Kargl wro

Re: CURRENT, usr/src on git, howto "mergemaster"?

> On Jan 4, 2021, at 11:42 AM, Marek Zarychta > wrote: … > it's probably high time to stop escalating this thread. Some people like > the way in which mergemaster copes with updates, some people like > etcupdate. With Git clean and smudge filters applied on local repo and > $FreeBSD$ IDs regen

Re: CURRENT, usr/src on git, howto "mergemaster"?

On 04.01.2021 19:59, Steve Kargl wrote: On Mon, Jan 04, 2021 at 10:30:28AM -0800, Enji Cooper wrote: On Jan 4, 2021, at 10:19, Warner Losh wrote: mergemaster has been on its way out since well before the switch to git. It's been disfavored for at least a decade and basically unmaintained i

Re: CURRENT, usr/src on git, howto "mergemaster"?

W dniu 04.01.2021 o 20:27, Enji Cooper pisze: > >> On Jan 4, 2021, at 11:15 AM, Jeffrey Bouquet >> wrote: > > … > >>> Dear Enji, >>> >>> to satisfy your curiosity: Yes, I have tried etcupdate(8) a few times >>> over years. It works fine, but I don't like the idea of editing >>> conflicted file

Re: CURRENT, usr/src on git, howto "mergemaster"?

On 2021-01-04 11:13, Marek Zarychta wrote: W dniu 04.01.2021 o 19:54, Enji Cooper pisze: On Jan 4, 2021, at 10:49 AM, Marek Zarychta wrote: … Terrible idea IMHO, but I am only the weak voice from the userbase. It's like deprecating old, well-worn hammer in the favour of the nail gun. Why

Re: HEADS UP: FreeBSD src repo transitioning to git this weekend

RW wrote this message on Fri, Jan 01, 2021 at 16:56 +: > On Thu, 31 Dec 2020 21:25:08 -0500 > grarpamp wrote: > > > > Is there any reason to think [bittorrent] insecure? > > > > Cost under $50k of compute to break sha-1, > > AFAIK you cannot break SHA-1 in the sense of creating data that

Re: CURRENT, usr/src on git, howto "mergemaster"?

On 2021-01-04 10:58, Enji Cooper wrote: On Jan 4, 2021, at 10:54 AM, Enji Cooper wrote: On Jan 4, 2021, at 10:49 AM, Marek Zarychta > wrote: … Terrible idea IMHO, but I am only the weak voice from the userbase. It's like deprecating old, well-worn ham

Re: CURRENT, usr/src on git, howto "mergemaster"?

> On Jan 4, 2021, at 11:15 AM, Jeffrey Bouquet > wrote: … >> Dear Enji, >> >> to satisfy your curiosity: Yes, I have tried etcupdate(8) a few times >> over years. It works fine, but I don't like the idea of editing >> conflicted files. >> >> I won't complain about etcupdate(8), but please le

Re: CURRENT, usr/src on git, howto "mergemaster"?

> On Jan 4, 2021, at 10:59 AM, Steve Kargl > wrote: > > On Mon, Jan 04, 2021 at 10:30:28AM -0800, Enji Cooper wrote: >> >>> On Jan 4, 2021, at 10:19, Warner Losh wrote: >>> >>> mergemaster has been on its way out since well before the switch to git. >>> It's been disfavored for at least a de

Re: CURRENT, usr/src on git, howto "mergemaster"?

On Mon, Jan 4, 2021 at 12:13 PM Marek Zarychta < zarych...@plan-b.pwste.edu.pl> wrote: > W dniu 04.01.2021 o 19:54, Enji Cooper pisze: > > > >> On Jan 4, 2021, at 10:49 AM, Marek Zarychta < > zarych...@plan-b.pwste.edu.pl> wrote: > > > > … > > > >> Terrible idea IMHO, but I am only the weak voice

Re: git non-time-sequential logs

On Mon, Jan 4, 2021 at 11:00 AM Franco Fichtner wrote: > > > > On 4. Jan 2021, at 7:52 PM, Enji Cooper wrote: > > > > The point is to stop looking at git like svn: commits should be done as > > larger bodies of work (merge commits), as opposed to single atomic commits. > > Er, uh, no. ;) > > Th

Re: CURRENT, usr/src on git, howto "mergemaster"?

On Mon, 4 Jan 2021 20:13:03 +0100, Marek Zarychta wrote: > W dniu 04.01.2021 o 19:54, Enji Cooper pisze: > > > >> On Jan 4, 2021, at 10:49 AM, Marek Zarychta > >> wrote: > > > > … > > > >> Terrible idea IMHO, but I am only the weak voice from the userbase. > >> > >> It's like deprecating

Re: CURRENT, usr/src on git, howto "mergemaster"?

W dniu 04.01.2021 o 19:54, Enji Cooper pisze: > >> On Jan 4, 2021, at 10:49 AM, Marek Zarychta >> wrote: > > … > >> Terrible idea IMHO, but I am only the weak voice from the userbase. >> >> It's like deprecating old, well-worn hammer in the favour of the nail >> gun. Why not deprecate biff(1),

Re: git non-time-sequential logs

On Mon, Jan 04, 2021 at 07:59:12PM +0100, Franco Fichtner wrote: > The author date stays the same, the committer date is sequential except > that it indicates the local time of the committer doing the cherry-pick > instead of the central server as opposed to svn: > > # git log --format=fuller T

Re: boot loader blank screen

On Mon, Jan 4, 2021 at 11:53 AM John Kennedy wrote: > On Mon, Jan 04, 2021 at 11:39:08AM -0700, Warner Losh wrote: > > Yea, this is a feature that needs to be fixed since black on black text > is > > a show stopper :( > > Ah, this is part of the "Terminal colours in current" thread? I saw > th

Re: git non-time-sequential logs

> On 4. Jan 2021, at 7:52 PM, Enji Cooper wrote: > > The point is to stop looking at git like svn: commits should be done as > larger bodies of work (merge commits), as opposed to single atomic commits. Er, uh, no. ;) The author date stays the same, the committer date is sequential except t

Re: CURRENT, usr/src on git, howto "mergemaster"?

On Mon, Jan 04, 2021 at 10:30:28AM -0800, Enji Cooper wrote: > >> On Jan 4, 2021, at 10:19, Warner Losh wrote: >> >> mergemaster has been on its way out since well before the switch to git. >> It's been disfavored for at least a decade and basically unmaintained in >> the base for maybe last 5 y

Re: CURRENT, usr/src on git, howto "mergemaster"?

> On Jan 4, 2021, at 10:54 AM, Enji Cooper wrote: > > >> On Jan 4, 2021, at 10:49 AM, Marek Zarychta > > wrote: > > … > >> Terrible idea IMHO, but I am only the weak voice from the userbase. >> >> It's like deprecating old, well-worn hammer in the favour

Re: boot loader blank screen

On Mon, Jan 04, 2021 at 11:39:08AM -0700, Warner Losh wrote: > Yea, this is a feature that needs to be fixed since black on black text is > a show stopper :( Ah, this is part of the "Terminal colours in current" thread? I saw that, but didn't correlate it with default black-on-black text. It l

Re: CURRENT, usr/src on git, howto "mergemaster"?

> On Jan 4, 2021, at 10:49 AM, Marek Zarychta > wrote: … > Terrible idea IMHO, but I am only the weak voice from the userbase. > > It's like deprecating old, well-worn hammer in the favour of the nail > gun. Why not deprecate biff(1), pom(6), nvi(1) etc.? Marek, I’m curious: have you

Re: git non-time-sequential logs

> On Jan 4, 2021, at 9:05 AM, Alan Somers wrote: > > On Mon, Jan 4, 2021 at 9:58 AM Poul-Henning Kamp > wrote: > >> >> John Kennedy writes: >> >>> This might be perfectly natural and just new to me, but when I look at >> the >>> git logs this morning I se

Re: git non-time-sequential logs

On Mon, Jan 4, 2021 at 10:08 AM Warner Losh wrote: ... > As for date order, we could also add a commit hook that requires the date > to be properly set, but that creates friction for developers. Is that > friction worth the benefits? I don't think so, but as you say we could also > add notes... bu

Re: CURRENT, usr/src on git, howto "mergemaster"?

W dniu 04.01.2021 o 19:30, Enji Cooper pisze: > >> On Jan 4, 2021, at 10:19, Warner Losh wrote: >> >> On Mon, Jan 4, 2021 at 9:36 AM Marek Zarychta >> >> wrote: >> >>> W dniu 04.01.2021 o 17:14, Warner Losh pisze: >>> etcupdate does a full three merge, while mergemaster fakes it in a numb

Re: boot loader blank screen

On Mon, 4 Jan 2021 08:22:56 -0800 John Kennedy wrote: > This is a little weird. > > Somewhere between 13.0-g2ff66a915526 (Dec 30th) and -gd03fd8ede2c4 (Dec 29th), > I've lost the screen in the boot loader. This is really weird because I > didn't update the boot loader (in quite a while, actuall

Re: CURRENT, usr/src on git, howto "mergemaster"?

> On Jan 4, 2021, at 10:33 AM, David Wolfskill wrote: > > On Mon, Jan 04, 2021 at 10:30:28AM -0800, Enji Cooper wrote: >> ... >> Adding to this: it has no maintainer, it’s less featureful, and it lacks >> tests. Once I switched to etcupdate a few years back I never looked back at >> mergemast

Re: boot loader blank screen

On Mon, Jan 4, 2021 at 11:35 AM John Kennedy wrote: > On Mon, Jan 04, 2021 at 06:30:38PM +0200, Toomas Soome wrote: > > Yes, it is known defect, and I???m searching for cause; the issue is > with /boot/loader and BIOS text mode (unfortunately I have the usual ???but > it is working for me??? case

Re: boot loader blank screen

On Mon, Jan 04, 2021 at 06:30:38PM +0200, Toomas Soome wrote: > Yes, it is known defect, and I???m searching for cause; the issue is with > /boot/loader and BIOS text mode (unfortunately I have the usual ???but it is > working for me??? case). For workaround, you can try to either: 1 (blind) > p

Re: CURRENT, usr/src on git, howto "mergemaster"?

On Mon, Jan 04, 2021 at 10:30:28AM -0800, Enji Cooper wrote: > ... > Adding to this: it has no maintainer, it’s less featureful, and it lacks > tests. Once I switched to etcupdate a few years back I never looked back at > mergemaster. > > I honestly think it should be deprecated in 13.x and rem

Re: CURRENT, usr/src on git, howto "mergemaster"?

On 1/4/21 7:18 PM, Warner Losh wrote: mergemaster has been on its way out since well before the switch to git. It's been disfavored for at least a decade I first heard about this today. While I don't have any opinion on this, shouldn't any reference to it in the instructions in /usr/src/UPDAT

Re: CURRENT, usr/src on git, howto "mergemaster"?

> On Jan 4, 2021, at 10:19, Warner Losh wrote: > > On Mon, Jan 4, 2021 at 9:36 AM Marek Zarychta > wrote: > >> W dniu 04.01.2021 o 17:14, Warner Losh pisze: >> >>> etcupdate does a full three merge, while mergemaster fakes it in a number >>> of ways. etcupdate directly keeps track of the res

Re: CURRENT, usr/src on git, howto "mergemaster"?

On Mon, Jan 4, 2021 at 9:36 AM Marek Zarychta wrote: > W dniu 04.01.2021 o 17:14, Warner Losh pisze: > > > etcupdate does a full three merge, while mergemaster fakes it in a number > > of ways. etcupdate directly keeps track of the resolutions, which is why > > $FreeBSD$ doesn't matter so much to

Re: git non-time-sequential logs

On Mon, Jan 4, 2021 at 10:51 AM Poul-Henning Kamp wrote: > > Alan Somers writes: > > > I'll be more frank than phk: it sucks. Git's commit dates are basically > > useless. > > Git is not built as, or to be, version control. > > Git is built to be distrbuted collaboration tool. > > The d

Re: git non-time-sequential logs

Alan Somers writes: > I'll be more frank than phk: it sucks. Git's commit dates are basically > useless. Git is not built as, or to be, version control. Git is built to be distrbuted collaboration tool. The designed-in version control aspect was always, and only, that the ranting fini

Re: git non-time-sequential logs

On Mon, Jan 4, 2021 at 9:58 AM Poul-Henning Kamp wrote: > > John Kennedy writes: > > > This might be perfectly natural and just new to me, but when I look at > the > > git logs this morning I see things like this (editing by me): > > > > Date: Mon Jan 4 17:30:00 2021 +0100 > >

Re: git non-time-sequential logs

John Kennedy writes: > This might be perfectly natural and just new to me, but when I look at the > git logs this morning I see things like this (editing by me): > > Date: Mon Jan 4 17:30:00 2021 +0100 > Date: Mon Dec 14 18:56:56 2020 +0100 > Date: Tue Dec 15 13:50

git non-time-sequential logs

On Mon, Jan 04, 2021 at 08:22:56AM -0800, John Kennedy wrote: > The git logs in /usr/src aren't time-sequential, so maybe I shouldn't trust > those dates above (I pulled it ~Jan 3rd and let it compile overnight), but > I'm going to repull all the sources and recompile, just in case. I might > have

Re: CURRENT, usr/src on git, howto "mergemaster"?

W dniu 04.01.2021 o 17:14, Warner Losh pisze: > etcupdate does a full three merge, while mergemaster fakes it in a number > of ways. etcupdate directly keeps track of the resolutions, which is why > $FreeBSD$ doesn't matter so much to it. > > mergemaster is deprecated and will likely be removed f

boot loader blank screen

This is a little weird. Somewhere between 13.0-g2ff66a915526 (Dec 30th) and -gd03fd8ede2c4 (Dec 29th), I've lost the screen in the boot loader. This is really weird because I didn't update the boot loader (in quite a while, actually), but I suppose it might drag some stuff off of the disk and mis

Re: CURRENT, usr/src on git, howto "mergemaster"?

> I do not remember mergemaster having a bootstrap stage in setting > it up, a stage that should be executed before /usr/src (or whatever) > is updated. So the procedures are different overall. etcupdate does a 3-way merge. What I did to replace mergemaster with etcupdate was: rm -fr /usr/src

Re: CURRENT, usr/src on git, howto "mergemaster"?

On Mon, Jan 4, 2021 at 5:57 AM Matthew Seaman wrote: > On 04/01/2021 12:29, David Wolfskill wrote: > > > Caveat: Since the switch, I have yet to encounter a case where I needed > > to merge a change in (e.g., because of a newly-created user, or there > > was a commit to /etc/crontab or /etc/newsy

Re: CURRENT, usr/src on git, howto "mergemaster"?

W dniu 04.01.2021 o 14:32, David Wolfskill pisze: > On Mon, Jan 04, 2021 at 05:22:10AM -0800, Jeffrey Bouquet wrote: >> ... >> after checking out stable/12 with git, here a >> # cd /usr/src/usr.sbin/mergemaster >> # sh ./mergemaster.sh -piPcv >> >> and then answering 'l' for left for most merge

Re: CURRENT, usr/src on git, howto "mergemaster"?

On Mon, Jan 04, 2021 at 05:22:10AM -0800, Jeffrey Bouquet wrote: > ... > after checking out stable/12 with git, here a > # cd /usr/src/usr.sbin/mergemaster > # sh ./mergemaster.sh -piPcv > > and then answering 'l' for left for most merges > it seems to have sufficed. > This was before install

Re: CURRENT, usr/src on git, howto "mergemaster"?

On Mon, 4 Jan 2021 12:57:43 +, Matthew Seaman wrote: > On 04/01/2021 12:29, David Wolfskill wrote: > > > Caveat: Since the switch, I have yet to encounter a case where I needed > > to merge a change in (e.g., because of a newly-created user, or there > > was a commit to /etc/crontab or /e

Re: CURRENT, usr/src on git, howto "mergemaster"?

On 04/01/2021 12:29, David Wolfskill wrote: Caveat: Since the switch, I have yet to encounter a case where I needed to merge a change in (e.g., because of a newly-created user, or there was a commit to /etc/crontab or /etc/newsyslog.conf). I may find things rather "more interesting" when that h

13-current panic

Hi, I have multiple servers running 13-CURRENT and after upgrade to r368448 the following panic began to appear on them: vpan1c() at vpanic.Ox1b2/frame Oxfe019b32ffa0 panic() at panic.0x43/frame Oxfe01933 trap_fatal() at trap_fatal.0x387/frame Oxfe019b330060 trap_pfault() at trap

Re: CURRENT, usr/src on git, howto "mergemaster"?

On Mon, Jan 04, 2021 at 12:35:28PM +0100, Hartmann, O. wrote: > Now, since /usr/src has been siwtched to git on several boxes and the former > svn tag > $FreeBSD$ seem not valid/useful anymore, how am I (or any other here) > supposed to > "mergemaster"? > > I did a full "mergemaster -CUFi" latel

CURRENT, usr/src on git, howto "mergemaster"?

Now, since /usr/src has been siwtched to git on several boxes and the former svn tag $FreeBSD$ seem not valid/useful anymore, how am I (or any other here) supposed to "mergemaster"? I did a full "mergemaster -CUFi" lately and did the same again, but when mergemaster ran the second (or n-th) tim