Skip to content

Commit

Permalink
Rename system preparation script
Browse files Browse the repository at this point in the history
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
  • Loading branch information
saschagrunert committed Oct 20, 2019
1 parent 100696b commit fc5427b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Expand Up @@ -342,7 +342,7 @@ jobs:
sudo hostnamectl set-hostname test
- run:
name: Prepare the system
command: sudo contrib/prepare-system.sh
command: sudo contrib/prepare-system
- run:
name: Run the tests
command: << parameters.run >>
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -82,7 +82,7 @@ run: build-release

.PHONY: run-image
run-image:
$(SUDO) contrib/prepare-system.sh
$(SUDO) contrib/prepare-system
mkdir -p $(RUN_DIR)
if [ -d /dev/mapper ]; then \
DEV_MAPPER=-v/dev/mapper:/dev/mapper ;\
Expand Down
4 changes: 3 additions & 1 deletion contrib/prepare-system.sh → contrib/prepare-system
@@ -1,10 +1,12 @@
#!/usr/bin/env bash
# The system preparation step needs to be done explicitly if running inside a
# container
set -euo pipefail

# Needs to be set if running this project inside a container
modprobe overlay
modprobe ip_conntrack
modprobe br_netfilter

sysctl net.bridge.bridge-nf-call-ip6tables=1
sysctl net.bridge.bridge-nf-call-iptables=1
sysctl net.ipv4.conf.all.route_localnet=1
Expand Down

0 comments on commit fc5427b

Please sign in to comment.