From owner-svn-src-head@freebsd.org Thu Aug 16 00:25:01 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 003101075974; Thu, 16 Aug 2018 00:25:00 +0000 (UTC) (envelope-from samy.mahmoudi@gmail.com) Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 66CCA8470D; Thu, 16 Aug 2018 00:25:00 +0000 (UTC) (envelope-from samy.mahmoudi@gmail.com) Received: by mail-pf1-x42a.google.com with SMTP id e13-v6so1188497pff.7; Wed, 15 Aug 2018 17:25:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=hzOHznmVQzqFFzHlRxqVGoZsaCP0LFHd/gkgA2fzjK4=; b=ANzwM4gsMiZ03ivsdWzlHcIrBgqJJpwRXbL5w8pGXeuArKYgxoHZ6Zc0Tl9UGKr7vw jpHBxQDjDEIdM9siJ1iInx0qn6yn0u2nFSVNg3oKYPafjytQJTsmRtoK8nni3OzVOBwt 353f/VdviSri1Lcr989j9dvcxb5fpmrZby6j29hfaM6AhBUxxwqxtY7eDID+GHmdsapT PlxoLqiiw/2t63C+qvD/xRY0VEy66EgCF7L8UwCpaPNZL5aqAtUnc4mPSS0lBGeD7i/7 wW93fNt2q2lvYeGTBRF68RCKM/5rgLYlObaWdW1kvSOYI/N/xTlvF0scONxkjaEpnNBl wExg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=hzOHznmVQzqFFzHlRxqVGoZsaCP0LFHd/gkgA2fzjK4=; b=s6vMDJmWtU/bOtxecAk14Uxi4VT9G/EEk/Z9YoAyELMVy1GZFWGOjN0qHhUUiArTtI X8RYx8Q0+HcxYcfrSPkLGDGhMPTWbIZhVr8al5TxPdw5eE9QC60GhzWl+Hj010bhTgUS QmcwFeaZ7rZhz+LNEVaXFz6L2CGxrSkNsWGaFq6uVXwE+tIoHrmlirBhKWYGo19sFNl+ Aa7ol8X6MkG18S22kiyGmbTcC8a0wH2WGtbHOlRN15Ak3wxfnJ4SedNT903CCnP93iCK nqY5ZpeafrN8sCJTCkL43u8W1D1IyR0ceSc5INFYAmUEHe+5jdC0kkTwcIYxdocCxviO TJjg== X-Gm-Message-State: AOUpUlEGUfdcMKRuSvnnC7mTbdIHmjjTVOFs3RBh1MvB6pNOJ8dTXs76 cEI/1yPQYBeY2AhX4b5IxO9DlqRlGS4ni77+QTOjLNU1 X-Google-Smtp-Source: AA+uWPzUTPmjK7BG+uq1RQOMweEjCsdJVBzhS6GaVJbS79/6hOQV7cXlwRTIq04PvHDdgHOxN4FHSs+xSay64vHGUDc= X-Received: by 2002:a65:5a8a:: with SMTP id c10-v6mr26142687pgt.389.1534379097570; Wed, 15 Aug 2018 17:24:57 -0700 (PDT) MIME-Version: 1.0 References: <201808151734.w7FHYE9r048846@pdx.rh.CN85.dnsmgr.net> <1534375319.1005259.1475586528.5E9C2023@webmail.messagingengine.com> In-Reply-To: <1534375319.1005259.1475586528.5E9C2023@webmail.messagingengine.com> From: Samy Mahmoudi Date: Thu, 16 Aug 2018 02:24:45 +0200 Message-ID: Subject: Re: svn commit: r337857 - in head: bin/csh bin/sh etc To: brd@freebsd.org Cc: rgrimes@freebsd.org, svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.27 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Aug 2018 00:25:01 -0000 Two days ago, I changed my beadm-compatible layout to have /root on a dedicated filesystem, separated from /. Then I upgraded to current and noticed two ln output errors. After some time cruising the FreeBSD source tree, I came to the conclusion that .cshrc and .profile were installed to the /root filesystem and that the two subsequent hardlinks failed because the respective targets .cshrc and .profile were (in my case) on a different filesystem, namely /. Is there any historical reason for hardlinking instead of softlinking ? Anyway, I will definitely keep an eye on your better approach. Le jeu. 16 ao=C3=BBt 2018 =C3=A0 01:22, Brad Davis a =C3= =A9crit : > On Wed, Aug 15, 2018, at 11:34 AM, Rodney W. Grimes wrote: > > > > > Author: brd > > > > > Date: Wed Aug 15 16:22:12 2018 > > > > > New Revision: 337857 > > > > > URL: https://svnweb.freebsd.org/changeset/base/337857 > > > > > > > > > > Log: > > > > > Fix build after r337849 > > > > > > > > > > This moves the symlink creation to after where the files are > installed. > > > > > > > > > > This also inverts the shell change so that it only happens if > MK_TCSH is on. > > > > > > > > > > Approved by: will (mentor) > > > > > Differential Revision: https://reviews.freebsd.org/D1672= 5 > > > > > > > > > > Modified: > > > > > head/bin/csh/Makefile > > > > > head/bin/sh/Makefile > > > > > head/etc/master.passwd > > > > > > > > > > Modified: head/bin/csh/Makefile > > > > > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > > > > > --- head/bin/csh/Makefile Wed Aug 15 16:16:59 2018 > (r337856) > > > > > +++ head/bin/csh/Makefile Wed Aug 15 16:22:12 2018 > (r337857) > > > > > @@ -49,8 +49,7 @@ MLINKS=3D csh.1 tcsh.1 > > > > > > > > > > LIBADD=3D termcapw crypt > > > > > > > > > > -LINKS=3D ${BINDIR}/csh ${BINDIR}/tcsh \ > > > > > - /root/.cshrc /.cshrc > > > > > +LINKS=3D ${BINDIR}/csh ${BINDIR}/tcsh > > > > > > > > > > CLEANFILES=3D ${GENHDRS} gethost csh.1 > > > > > > > > > > @@ -158,7 +157,7 @@ beforeinstall: > > > > > rm -f ${DESTDIR}/.cshrc > > > > > > > > > > afterinstallconfig: > > > > > - sed -i "" -e 's;/bin/csh;/bin/sh;' > ${DESTDIR}/etc/master.passwd > > > > > + sed -i "" -e 's;/bin/sh;/bin/csh;' > ${DESTDIR}/etc/master.passwd > > > > > pwd_mkdb -i -p -d ${DESTDIR}/etc > ${DESTDIR}/etc/master.passwd > > > > > > > > > > .include > > > > > > > > > > Modified: head/bin/sh/Makefile > > > > > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > > > > > --- head/bin/sh/Makefile Wed Aug 15 16:16:59 2018 > (r337856) > > > > > +++ head/bin/sh/Makefile Wed Aug 15 16:22:12 2018 > (r337857) > > > > > @@ -37,7 +37,6 @@ WFORMAT=3D0 > > > > > > > > > > CLEANFILES+=3D mknodes mksyntax > > > > > CLEANFILES+=3D ${GENSRCS} ${GENHDRS} > > > > > -LINKS=3D /root/.profile /.profile > > > > > > > > > > build-tools: mknodes mksyntax > > > > > > > > > > @@ -66,5 +65,8 @@ SUBDIR.${MK_TESTS}+=3D tests > > > > > > > > > > beforeinstall: > > > > > rm -f ${DESTDIR}/.profile > > > > > > > > Still unconditionally removing /.profile, but only replacing it > > > > when installconfig: is run. > > > > > > Yes, working on a separate review for this.. > > > > > > > > + > > > > > +afterinstallconfig: > > > > > + ${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}/root/.profile > ${DESTDIR}/.profile > > > > > > > > > > .include > > > > > > > > > > Modified: head/etc/master.passwd > > > > > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > > > > > --- head/etc/master.passwd Wed Aug 15 16:16:59 2018 > (r337856) > > > > > +++ head/etc/master.passwd Wed Aug 15 16:22:12 2018 > (r337857) > > > > > @@ -1,6 +1,6 @@ > > > > > # $FreeBSD$ > > > > > # > > > > > -root::0:0::0:0:Charlie &:/root:/bin/csh > > > > > +root::0:0::0:0:Charlie &:/root:/bin/sh > > > > > > > > I strongly object to this change to master.passwd, and feel it shou= ld > > > > be worked around if in anyway possible. I have pointed out in the > > > > review ways to not have to make this change. > > > > > > I opened up the following which addresses some of your feedback: > > > https://reviews.freebsd.org/D16728 > > > > Bleh, can we revert all of this, and take a second look with many more > > eyes on this. master.passwd coming from libc makes my head hurt! > > > > Also this is now a patch on a patch on a patch, time to end the dive > > down the rabbit hole! > > Yes, I did a partial revert of the problematic spots in r337882. > > I will redo with a better approach tomorrow. > > Sorry for the trouble and your .cshrc getting clobbered. > > > Regards, > Brad Davis > _______________________________________________ > svn-src-head@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org" >