Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix some bitrot in enter_grain #252

Merged

Conversation

zenhack
Copy link
Collaborator

@zenhack zenhack commented Jan 31, 2020

with #![feature(alloc_system)] I get an error from the rust toolchain
that the feature has been removed. We don't appear to actually be using
this anyway, so let's just remove it.

@zenhack
Copy link
Collaborator Author

zenhack commented Jan 31, 2020

Maybe hold off on this one until we decide whether to just switch over to using nsenter.

@ocdtrekkie
Copy link
Collaborator

@zenhack Agreed on that.

@paulproteus
Copy link
Collaborator

paulproteus commented Jan 31, 2020 via email

@zenhack
Copy link
Collaborator Author

zenhack commented Jan 31, 2020

Hm, the binary on master is >600K vs this one at 200K, so if that's the case, the compiler has gotten better by a margin that swallows those savings pretty thoroughly. We still shouldn't commit it to the repo though...

@ocdtrekkie
Copy link
Collaborator

Since #253 is concerned about excess commits of binary files, if you fix the enter-grain binary, can we get both this fix and that fix in a single commit, so we are only adding one copy of the binary?

@zenhack
Copy link
Collaborator Author

zenhack commented Jan 31, 2020

Sure, I'll --amend it onto this one. We can maybe do the PyPI packaging soonish so we don't have to worry about this again.

@zenhack zenhack force-pushed the enter-grain-toolchain-bitrot branch from 6abf69b to 11f9474 Compare January 31, 2020 22:07
@zenhack
Copy link
Collaborator Author

zenhack commented Jan 31, 2020

@ocdtrekkie, updated. should work now.

This is one commit instead of two because we didn't want to bloat the
repository with two updates to the executable. We should really just
remove the binary from the repo and build it; see sandstorm-io#253

The bitrot:

With #![feature(alloc_system)] I get an error from the rust toolchain
that the feature has been removed. We don't appear to actually be using
this anyway, so let's just remove it.
@zenhack zenhack force-pushed the enter-grain-toolchain-bitrot branch from 11f9474 to 8ce6bd4 Compare January 31, 2020 22:19
@ocdtrekkie
Copy link
Collaborator

I tested this locally and I'm happy with it.

@ocdtrekkie ocdtrekkie merged commit 06438b4 into sandstorm-io:master Feb 1, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants