Skip to content
This repository was archived by the owner on Nov 17, 2022. It is now read-only.

Conversation

hebasto
Copy link
Member

@hebasto hebasto commented Aug 17, 2018

On Debian 9 the /etc/rc.local file has been deprecated. So the newly created one should be executable.

USE_LXC environment variable is managed by the gitian-build.py script.
Global export of USE_LXC breaks make-clean-vm logic of the gitian-builder when using Docker.

@maflcko
Copy link

maflcko commented Aug 17, 2018

utACK b2889aa

@maflcko
Copy link

maflcko commented Aug 17, 2018

Would need the same change in the fedora instructions (no?)

@hebasto
Copy link
Member Author

hebasto commented Aug 17, 2018

@MarcoFalke

Would need the same change in the fedora instructions (no?)

Sure.

@@ -38,9 +38,7 @@ echo 'exit 0' >> /etc/rc.d/rc.local
# mark executable so that the rc.local-service unit gets pulled automatically
# into multi-user.target
chmod +x /etc/rc.d/rc.local
# make sure that USE_LXC is always set when logging in as gitianuser,
# and configure LXC IP addresses
echo 'export USE_LXC=1' >> /home/gitianuser/.bash_profile
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removing this here would mean it had to be set when manually building (not using the python script)?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would be easier for review to split the two changes into two pull requests

hebasto added a commit to hebasto/bitcoin that referenced this pull request Sep 6, 2018
Add dedicated `--virtualization` option instead of `--kvm` and
`--docker` ones.

Some other improvements:

 - all USE_* environment variables for the gitian-builder are set
explicitly (ref: bitcoin-core/docs#35);

 - the error message does not fire if the Docker has been installed
already (ref:
bitcoin#13623 (comment));

 - the Docker does not depend on `apt-cacher-ng` package (ref:
bitcoin-core/docs#33);

 - do not warn about macOS build on setup;

 - style corrections.
@hebasto
Copy link
Member Author

hebasto commented Sep 7, 2018

@MarcoFalke The both guides gitian-building-setup-gitian-debian.md and gitian-building-setup-gitian-fedora.md suppose the gitian building by means of LXC and gitian-builder with no using of the gitian-build.py script.

So the current setup of the USE_LXC environment variable is sane and should not be changed.

I will keep only the explicit setting of the /etc/rc.local file executable in this PR.

@maflcko
Copy link

maflcko commented Sep 7, 2018

Makes sense. Happy to re-review in that case.

@hebasto
Copy link
Member Author

hebasto commented Sep 7, 2018

@MarcoFalke May I ask you to change this PR title to more relevant one?

@maflcko maflcko changed the title docs: setup fix Mark created /etc/rc.local executable Sep 8, 2018
@maflcko maflcko changed the title Mark created /etc/rc.local executable Mark created /etc/rc.local executable Sep 8, 2018
@maflcko maflcko merged commit 0caa0f9 into bitcoin-core:master Sep 8, 2018
maflcko pushed a commit that referenced this pull request Sep 8, 2018
0caa0f9 Mark created `/etc/rc.local` executable (Hennadii Stepanov)

Pull request description:

  On Debian 9 the `/etc/rc.local` file has been deprecated. So the newly created one should be executable.

  ~`USE_LXC` environment variable is managed by the [`gitian-build.py`](https://github.com/bitcoin/bitcoin/blob/master/contrib/gitian-build.py) script.
  Global export of USE_LXC breaks [`make-clean-vm`](https://github.com/devrandom/gitian-builder/blob/5dca44398924140619bb6ef63736ab31b76ba743/libexec/make-clean-vm#L8) logic of the `gitian-builder` when using Docker.~

Tree-SHA512: f1f529da1ef377f12e56e3d72ccd20e9c1dbfb2718d23b95170da795c8946adfe570a864a916d959e410265ba6cdcd768ac15fff04d47f0f64e1e8073557096b
@hebasto hebasto deleted the debian-gitian-fix branch September 9, 2018 06:09
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants