Date: Sun, 12 May 2019 09:30:19 +0200 From: mj-mailinglist@gmx.de To: "Emmanuel Vadot" <manu@bidouilliste.com> Cc: freebsd-pkgbase@freebsd.org Subject: Aw: Re: Existing passwd and group files overwritten by pkgbase upgrade Message-ID: <trinity-881e4f79-ad36-4e97-88c6-272be38df868-1557646219741@3c-app-gmx-bs32> In-Reply-To: <20190511154410.1a74fecbd8cecef669bb6acf@bidouilliste.com> References: <trinity-4cdcf66c-108d-4070-a589-654d4dcb4179-1557581001370@3c-app-gmx-bs17> <20190511154410.1a74fecbd8cecef669bb6acf@bidouilliste.com>
next in thread | previous in thread | raw e-mail | index | archive | help
> > Hi Ashley, > > > > I guess this=C2=A0change=C2=A0is=C2=A0the cause:=C2=A0https://reviews= =2Efreebsd=2Eorg/D20173 > > It marks the group and=C2=A0the master=2Epasswd file for inclusion in = the=C2=A0 > > FreebSD-runtime package=2E > > I tried this change on my 12 system,=C2=A0the files are included in th= e > > package=2E You also see them in the runtime=2Eplist=C2=A0file, but as = regular file, > > not marked as a config file, like the motd file for example=2E > > =C2=A0 > > =2E=2E=2E > > @(root,wheel,0644,) /etc/group > > @(root,wheel,0600,) /etc/master=2Epasswd > > @config(root,wheel,0644,) /etc/motd > > =2E=2E=2E > > =C2=A0 > > i guess now the existing file is replaced by the new file, instead of = beeing > > merged with it=2E > > i think,=C2=A0the tag "config" must be added to the above patch=2E But= i am not sure, > > what the sytnax looks like for this=2E > > =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=2Epasswd, > > > /etc/pwd=2Edb and /etc/spwd=2Edb had been overwritten=2E > > >=C2=A0 > > > I encountered this after running 'make packages', installing into a > > > ZFS Boot Environment using bectl to create and mount a new BE, runni= ng > > > 'pkg -r $mounpoint upgrade -y' and 'pkg -r $mountpoint -yg "FreeBSD-= *"' > > > to upgrade the packages and insure that new base packages got instal= led, > > > and finally unmounting and activating the BE=2E > > >=C2=A0 > > > ~Ashley Chase >=20 >=20 > Yes sorry that's my fault=2E > I beleive the included patch should work but I don't have time to test > right now=2E >=20 > diff --git a/etc/Makefile b/etc/Makefile > index ab70a94bc761=2E=2E4b60868fe3dc 100644 > --- a/etc/Makefile > +++ b/etc/Makefile > @@ -69,9 +69,9 @@ distribution: > rc=2Efirewall ${DESTDIR}/etc; > =2Eendif > cd ${=2ECURDIR}; \ > - ${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=2Epasswd ${DESTDIR}/etc; >=20 > =2Eif ${MK_TCSH} =3D=3D "no" >=20 > I'll try to test soon and commit=2E >=20 > -- > Emmanuel Vadot <manu@bidouilliste=2Ecom> <manu@freebsd=2Eorg> I added the change to the Makefile and run make packages again, now the runtime=2Eplist entries for groups and master=2Epasswd have the "config" attribute: =2E=2E=2E @config(root,wheel,0644,) /etc/group @config(root,wheel,0600,) /etc/master=2Epasswd =2E=2E=2E -- Martin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?trinity-881e4f79-ad36-4e97-88c6-272be38df868-1557646219741>