diff options
| author | Loïc Hoguin <[email protected]> | 2018-04-19 14:42:07 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2018-04-19 14:42:07 +0200 |
| commit | 9fb9738884c0bbd21716a587ef2fc51b6ef9d5d4 (patch) | |
| tree | 53079c2d789367f4cc9ea2f24c65e2ed8c7cd9e4 | |
| parent | d2037b8b8b3335d829ec4aed2e5cd07a1b7013d3 (diff) | |
| download | ci-9fb9738884c0bbd21716a587ef2fc51b6ef9d5d4.tar.gz ci-9fb9738884c0bbd21716a587ef2fc51b6ef9d5d4.tar.bz2 ci-9fb9738884c0bbd21716a587ef2fc51b6ef9d5d4.zip | |
Better SystemD fix for Arch Linux
Also fixes other services independent of networking.
| -rwxr-xr-x | archlinux.sh | 2 | ||||
| -rw-r--r-- | ci.d/archlinux | 7 | ||||
| -rwxr-xr-x | fix-lxc.sh | 7 |
3 files changed, 15 insertions, 1 deletions
diff --git a/archlinux.sh b/archlinux.sh index 2a39155..4db1a8b 100755 --- a/archlinux.sh +++ b/archlinux.sh @@ -14,7 +14,7 @@ for f in ci.d/*; do source "$f"; done buildkite_stop $DIST lxc_destroy lxc_create $DIST $RELEASE $ARCH -archlinux_fix_network +#archlinux_fix_network lxc_wait_for_ip pacman_upgrade pacman_install $PACKAGES diff --git a/ci.d/archlinux b/ci.d/archlinux index 100bc60..c899c43 100644 --- a/ci.d/archlinux +++ b/ci.d/archlinux @@ -6,6 +6,13 @@ archlinux_enable_cron() { } # archlinux_fix_network +# +# Only necessary with default LXC. A better fix would be to +# append the following lines to /usr/share/lxc/config/common.seccomp: +# +# keyctl_chown errno 38 +# keyctl errno 38 +# archlinux_fix_network() { # We ForceConnect because the interface is up at container startup. lxc_do bash -c \ diff --git a/fix-lxc.sh b/fix-lxc.sh new file mode 100755 index 0000000..f040ece --- /dev/null +++ b/fix-lxc.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env sh + +set -e +#set -x + +echo "keyctl_chown errno 38" >> /usr/share/lxc/config/common.seccomp +echo "keyctl errno 38" >> /usr/share/lxc/config/common.seccomp |