init: Use root's home directory in single-user mode
ClosedPublic
Actions

Authored by jilles on Sun, Sep 14, 10:08 PM.

Details

Reviewers

emaste
kevans
ivy

Commits

rGca771d7ae527: init: Use root's home directory in single-user mode
rG779812d66989: init: Use root's home directory in single-user mode

Summary

When starting single-user mode, use the home directory from user root as current directory and for the HOME environment variable. If the directory does not exist, set HOME=/.

Also adjust /root/.profile to stop setting HOME, since it should always have been set now.

This is intended to keep shell startup files working in single-user mode after /.profile has been removed by a change like https://reviews.freebsd.org/D52161 .

Test Plan

build and install world
ensure /.profile does not exist
boot in single-user mode
verify HOME is /root and the prompt is root@:~ # as set by /root/.shrc

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

jilles created this revision.Sun, Sep 14, 10:08 PM

Herald added a subscriber: imp. · View Herald TranscriptSun, Sep 14, 10:08 PM

jilles requested review of this revision.Sun, Sep 14, 10:08 PM

Yeah, this seems fine to me. I did wonder for a second if the /rescue variants of shells do or should assume setugid behavior and avoid loading dotfiles in case something in the profile or other bits finds a way to make the shell unusable, but I didn't really convince myself.

This revision is now accepted and ready to land.Mon, Sep 15, 3:12 AM

emaste accepted this revision.Mon, Sep 15, 1:42 PM

i was planning to do this myself at some point, thanks!

ivy added a child revision: D52161: sh: Remove /.profile.Mon, Sep 15, 4:59 PM

ivy mentioned this in D52161: sh: Remove /.profile.

In D52527#1199611, @kevans wrote:

I did wonder for a second if the /rescue variants of shells do or should assume setugid behavior and avoid loading dotfiles in case something in the profile or other bits finds a way to make the shell unusable, but I didn't really convince myself.

The /bin/csh and /rescue/csh have different dotfiles and could therefore be used to recover from this kind of issue. Anyway, this was the case before this change as well.

Closed by commit rG779812d66989: init: Use root's home directory in single-user mode (authored by jilles). · Explain WhyTue, Sep 16, 8:42 PM

This revision was automatically updated to reflect the committed changes.

jilles added a commit: rG779812d66989: init: Use root's home directory in single-user mode.

jilles added a commit: rGca771d7ae527: init: Use root's home directory in single-user mode.Tue, Sep 23, 9:39 PM