pkg export and hab-sup/hab-launcher commands should honor fs_root #5592
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mwrock
requested review from
baumanj,
chefsalim,
christophermaier,
eeyun,
elliott-davis,
fnichol,
raskchanky and
reset
as code owners
|
Thanks for the pull request! Here is what will happen next:
Thank you for contributing! |
baumanj
approved these changes
Sep 10, 2018
components/hab/src/exec.rs
Outdated
| @@ -77,8 +77,8 @@ where | |||
| return Err(Error::ExecCommandNotFound(command)); | |||
| } | |||
|
|
|||
| let fs_root_path = Path::new("/"); | |||
| match PackageInstall::load_at_least(ident, None) { | |||
| let fs_root_path = Path::new(&*FS_ROOT_PATH); | |||
There was a problem hiding this comment.
How about:
let fs_root_path = FS_ROOT_PATH.as_path();I think doing this more explicitly is easier to understand for those who may not intuitively understand all of the rust magic going on here. Especially when the name FS_ROOT_PATH doesn't make it clear that its type is actually a reference to a PathBuf.
let fs_root_path = &*FS_ROOT_PATH;Works too, but I think that while it's shorter, it's more confusing.
| @@ -605,8 +606,9 @@ fn supervisor_cmd() -> Result<PathBuf> { | |||
| return Ok(PathBuf::from(command)); | |||
| } | |||
| let ident = PackageIdent::from_str(SUP_PACKAGE_IDENT).unwrap(); | |||
| match PackageInstall::load_at_least(&ident, None) { | |||
| Ok(install) => match core::fs::find_command_in_pkg(SUP_CMD, &install, "/") { | |||
| let fs_root_path = Path::new(&*FS_ROOT_PATH); | |||
Signed-off-by: mwrock <matt@mattwrock.com>
chef-ci
pushed a commit
that referenced
this pull request
Sep 11, 2018
Obvious fix; these changes are the result of automation not creative thinking.
christophermaier
added
Focus:Launcher
christophermaier
added
Type: Bug
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This week @trevorghess noticed that
hab pkg export dockerinside of a local windows studio was failing with:After researching this it ends up that
hab pkg exportcommands do not honor theFS_ROOTenvironment variable on Windows which will cause export to break in a local (non-docker) studio.This fixes that scenario. It also fixes another case I have been aware of for a while but was not broken enough to research. Formerly
hab-launchandhab-supbinary calls have not honored fs_root either. This means that in a local Windows studio, the launcher and supervisor binaries inc:\hab\pkgsare invoked. Functionally that is really not a big deal but is out of alignment with the self contained nature of a studio.Signed-off-by: mwrock matt@mattwrock.com