Date: Wed, 15 May 2019 21:11:56 -0400 From: "Brad Davis" <brd@so14k.com> To: freebsd-pkgbase@freebsd.org Subject: Re: Existing passwd and group files overwritten by pkgbase upgrade Message-ID: <00a80a0e-b71a-4d71-9f19-25db34d1d906@www.fastmail.com> In-Reply-To: <58083f9a-f51a-4094-a728-fde6a2ec5442@www.fastmail.com> References: <trinity-4cdcf66c-108d-4070-a589-654d4dcb4179-1557581001370@3c-app-gmx-bs17> <20190511154410.1a74fecbd8cecef669bb6acf@bidouilliste.com> <20190513032404.7iwcnu4kkfqsiok4@eris.lan> <20190513143917.fbdb507a97741a98e0eb823e@bidouilliste.com> <58083f9a-f51a-4094-a728-fde6a2ec5442@www.fastmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, May 15, 2019, at 1:39 PM, Brad Davis wrote: > On Mon, May 13, 2019, at 8:39 AM, Emmanuel Vadot wrote: > > On Sun, 12 May 2019 20:24:04 -0700 > > Ashley Chase <erisianash@gmail.com> wrote: > >=20 > > > On Sat, May 11, 2019 at 03:44:10PM +0200, Emmanuel Vadot wrote: > > > > On Sat, 11 May 2019 15:23:21 +0200 > > > > mj-mailinglist@gmx.de wrote: > > > >=20 > > > > > Hi Ashley, > > > > >=20 > > > > > I guess this=C2=A0change=C2=A0is=C2=A0the cause:=C2=A0https://= reviews.freebsd.org/D20173 > > > > > It marks the group and=C2=A0the master.passwd file for inclusi= on in the=C2=A0 > > > > > FreebSD-runtime package. > > > > > I tried this change on my 12 system,=C2=A0the files are includ= ed in the > > > > > package. You also see them in the runtime.plist=C2=A0file, but= as regular file, > > > > > not marked as a config file, like the motd file for example. > > > > > =C2=A0 > > > > > ... > > > > > @(root,wheel,0644,) /etc/group > > > > > @(root,wheel,0600,) /etc/master.passwd > > > > > @config(root,wheel,0644,) /etc/motd > > > > > ... > > > > > =C2=A0 > > > > > i guess now the existing file is replaced by the new file, ins= tead of beeing > > > > > merged with it. > > > > > i think,=C2=A0the tag "config" must be added to the above patc= h. But i am not sure, > > > > > what the sytnax looks like for this. > > > > > =C2=A0 > > > > > -- > > > > > Martin > > > > > =C2=A0 > > > > > > After building and installing -CURRENT r347469 using in-tree= pkgbase, I > > > > > > discovered that my /etc/group, /etc/passwd, /etc/master.pass= wd, > > > > > > /etc/pwd.db and /etc/spwd.db had been overwritten. > > > > > >=C2=A0 > > > > > > I encountered this after running 'make packages', installing= into a > > > > > > ZFS Boot Environment using bectl to create and mount a new B= E, running > > > > > > 'pkg -r $mounpoint upgrade -y' and 'pkg -r $mountpoint -yg "= FreeBSD-*"' > > > > > > to upgrade the packages and insure that new base packages go= t installed, > > > > > > and finally unmounting and activating the BE. > > > > > >=C2=A0 > > > > > > ~Ashley Chase > > > > > > _______________________________________________ > > > > > > freebsd-pkgbase@freebsd.org mailing list > > > > > > https://lists.freebsd.org/mailman/listinfo/freebsd-pkgbase[h= ttps://lists.freebsd.org/mailman/listinfo/freebsd-pkgbase] > > > > > > To unsubscribe, send any mail to "freebsd-pkgbase-unsubscrib= e@freebsd.org" > > > > > >=C2=A0 > > > > > _______________________________________________ > > > > > freebsd-pkgbase@freebsd.org mailing list > > > > > https://lists.freebsd.org/mailman/listinfo/freebsd-pkgbase > > > > > To unsubscribe, send any mail to "freebsd-pkgbase-unsubscribe@= freebsd.org" > > > >=20 > > > > Yes sorry that's my fault. > > > > I beleive the included patch should work but I don't have time = to test > > > > right now. > > > >=20 > > > > diff --git a/etc/Makefile b/etc/Makefile > > > > index ab70a94bc761..4b60868fe3dc 100644 > > > > --- a/etc/Makefile > > > > +++ b/etc/Makefile > > > > @@ -69,9 +69,9 @@ distribution: > > > > rc.firewall ${DESTDIR}/etc; > > > > .endif > > > > cd ${.CURDIR}; \ > > > > - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 -T > > > > "tags=3Dpackage=3Druntime"\ > > > > + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 -T > > > > "tags=3Dpackage=3Druntime,config"\ ${BIN1} ${DESTDIR}/etc; \ > > > > - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 -T > > > > "tags=3Dpackage=3Druntime"\ > > > > + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 -T > > > > "tags=3Dpackage=3Druntime,config"\ master.passwd ${DESTDIR}/etc;= > > > > =20 > > > > .if ${MK_TCSH} =3D=3D "no" > > > >=20 > > > > I'll try to test soon and commit. > > >=20 > > > This resolved the issue. Thank you. > >=20 > > I'll come up with a different version of the patch, the problem wit= h > > this one is that we install rc.bsdextended as a config file while it= 's > > not one. > > I also think that we should use CONFS for those file so the metadat= a > > will be added automatically. > > I've reverted the commits for now. >=20 > Unfortunately this is going to break again when I commit this:=20 > https://reviews.freebsd.org/D16728 >=20 > But once this goes in, the files will be properly tagged as a config=20= > file and merged properly in the future. >=20 > Sorry in advance. HEADS UP: This was committed as r347638. Regards, Brad Davis
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?00a80a0e-b71a-4d71-9f19-25db34d1d906>