Page MenuHomeFreeBSD

Fix links install for bin/csh and bin/sh
ClosedPublic

Authored by brd on Aug 15 2018, 3:49 PM.

Details

Summary

Additionally invert the csh shell change for root

Diff Detail

Repository
rS FreeBSD src repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

brd created this revision.Aug 15 2018, 3:49 PM
rgrimes added inline comments.
bin/csh/Makefile
160 ↗(On Diff #46712)

This is in the wrong place, tcsh csh link has 0 to do with installconfig.

161 ↗(On Diff #46712)

Why is installconfig editing the master.password file at all? It certainly did not install it, and should not in anyway be doing anything that effects the contents.

etc/master.passwd
3 ↗(On Diff #46712)

Please do not do this.

brd added inline comments.Aug 15 2018, 4:09 PM
bin/csh/Makefile
160 ↗(On Diff #46712)

Yup, I was too quick here... will update

161 ↗(On Diff #46712)

Yet... It will once I move master.passwd to CONFS

etc/master.passwd
3 ↗(On Diff #46712)

Why, this whole change makes it to what we have today.. i.e. if csh is enabled the sed above switches to it, but otherwise it leaves it as sh. I just inverted how it was done.

brd updated this revision to Diff 46716.Aug 15 2018, 4:13 PM

Update for csh/tcsh LINK

brd marked 2 inline comments as done.Aug 15 2018, 4:14 PM
will accepted this revision.Aug 15 2018, 4:18 PM
This revision is now accepted and ready to land.Aug 15 2018, 4:18 PM
This revision was automatically updated to reflect the committed changes.
rgrimes added inline comments.Aug 15 2018, 4:23 PM
bin/csh/Makefile
161 ↗(On Diff #46712)

I see it now, this has to do with unwrapping MK_TCSH.

etc/master.passwd
3 ↗(On Diff #46712)

So can't you de-invert it and leave master.passwd untouched?

brd added inline comments.Aug 15 2018, 4:25 PM
etc/master.passwd
3 ↗(On Diff #46712)

What value would that provide?

rgrimes added inline comments.Aug 15 2018, 4:30 PM
etc/master.passwd
3 ↗(On Diff #46712)

Actually the more I think about this, the whole edit of master.passwd should be done in the Makefile that is installing it, and these edits in the tcsh/Makefile ripped out. It is simply the wrong place for it.

You do not see minimizing changes to src files as having value?

op added a subscriber: op.Aug 15 2018, 8:57 PM

This is still wrong.

  • It would be better to use pw user mod 0 -s /path/shell instead of sed.
  • The toor user exists in master.passwd to allow to log in with sh or bash.