Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Gitian: Change lxc ip link

Browse Source 
The ip link currently listed in the README no longer works on the newest
version of lxc shipped with ubuntu 18.04, this commit corrects this.
This commit is contained in:
TheCharlatan 2019-12-29 01:38:19 +01:00
parent b4e1dc83d2
commit c11e64fc4c
No known key found for this signature in database
GPG Key ID: 9B79B45691DB4173
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/gitian/README.md
View File

@ -62,7 +62,7 @@ echo "%sudo ALL=NOPASSWD: /usr/bin/lxc-execute" >> /etc/sudoers.d/gitian-lxc
# make /etc/rc.local script that sets up bridge between guest and host # make /etc/rc.local script that sets up bridge between guest and host
echo '#!/bin/sh -e' > /etc/rc.local echo '#!/bin/sh -e' > /etc/rc.local
echo 'brctl addbr br0' >> /etc/rc.local echo 'brctl addbr br0' >> /etc/rc.local
echo 'ip addr add 10.0.3.1/24 broadcast 10.0.3.255 dev br0' >> /etc/rc.local echo 'ip addr add 10.0.2.2/24 broadcast 10.0.2.255 dev br0' >> /etc/rc.local
echo 'ip link set br0 up' >> /etc/rc.local echo 'ip link set br0 up' >> /etc/rc.local
echo 'firewall-cmd --zone=trusted --add-interface=br0' >> /etc/rc.local echo 'firewall-cmd --zone=trusted --add-interface=br0' >> /etc/rc.local
echo 'exit 0' >> /etc/rc.local echo 'exit 0' >> /etc/rc.local
@ -70,8 +70,8 @@ chmod +x /etc/rc.local
# make sure that USE_LXC is always set when logging in as gitianuser, # make sure that USE_LXC is always set when logging in as gitianuser,
# and configure LXC IP addresses # and configure LXC IP addresses
echo 'export USE_LXC=1' >> /home/gitianuser/.profile echo 'export USE_LXC=1' >> /home/gitianuser/.profile
echo 'export GITIAN_HOST_IP=10.0.3.1' >> /home/gitianuser/.profile echo 'export GITIAN_HOST_IP=10.0.2.2' >> /home/gitianuser/.profile
echo 'export LXC_GUEST_IP=10.0.3.5' >> /home/gitianuser/.profile echo 'export LXC_GUEST_IP=10.0.2.5' >> /home/gitianuser/.profile
reboot reboot
``` ```

4
contrib/gitian/gitian-build.py
View File

@ -157,9 +157,9 @@ def main():
elif not args.kvm: elif not args.kvm:
os.environ['USE_LXC'] = '1' os.environ['USE_LXC'] = '1'
if not 'GITIAN_HOST_IP' in os.environ.keys(): if not 'GITIAN_HOST_IP' in os.environ.keys():
os.environ['GITIAN_HOST_IP'] = '10.0.3.1' os.environ['GITIAN_HOST_IP'] = '10.0.2.2'
if not 'LXC_GUEST_IP' in os.environ.keys(): if not 'LXC_GUEST_IP' in os.environ.keys():
os.environ['LXC_GUEST_IP'] = '10.0.3.5' os.environ['LXC_GUEST_IP'] = '10.0.2.5'
# Disable MacOS build if no SDK found # Disable MacOS build if no SDK found
args.nomac = False args.nomac = False