Skip to content

Commit

Permalink
Merge pull request #109 from AkihiroSuda/b
Browse files Browse the repository at this point in the history
fix indent
  • Loading branch information
AkihiroSuda authored Jul 25, 2019
2 parents 8a52d60 + 91b880c commit 68365f0
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ services:

script:
- docker build -t slirp4netns-tests -f Dockerfile.tests .
- docker run --security-opt seccomp="unconfined" -ti --rm -v /dev:/dev slirp4netns-tests
- docker run --security-opt seccomp="unconfined" --rm -v /dev:/dev slirp4netns-tests
- docker build -q -f Dockerfile.buildtests .
2 changes: 1 addition & 1 deletion Dockerfile.tests
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu AS build
FROM ubuntu:18.04 AS build
RUN apt update && apt install -y automake autotools-dev make gcc libglib2.0-dev
COPY . /slirp4netns
WORKDIR /slirp4netns
Expand Down
2 changes: 1 addition & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ benchmark:

ci:
$(MAKE) indent
test -z "$(git diff)"
git diff --exit-code
# TODO: make sure ./vendor is synced with ./vendor.sh
# (hard to verify during `make`, because vendor.sh removes ./vendor/libslirp/src/.deps)
$(MAKE) lint
Expand Down
6 changes: 2 additions & 4 deletions main.c
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,8 @@ static int configure_network(const char *tapname,
}

// set loopback device to UP
struct ifreq ifr_lo = {
.ifr_name = "lo",
.ifr_flags = IFF_UP | IFF_RUNNING
};
struct ifreq ifr_lo = { .ifr_name = "lo",
.ifr_flags = IFF_UP | IFF_RUNNING };
if (ioctl(sockfd, SIOCSIFFLAGS, &ifr_lo) < 0) {
perror("cannot set device up");
return -1;
Expand Down

0 comments on commit 68365f0

Please sign in to comment.