Date: Wednesday, July 23, 2014 @ 01:32:13 Author: seblu Revision: 116129
fix FS#41289 implement FS#40847 Modified: docker/trunk/PKGBUILD docker/trunk/docker.install ----------------+ PKGBUILD | 13 +++++++++---- docker.install | 11 +++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-07-22 23:16:12 UTC (rev 116128) +++ PKGBUILD 2014-07-22 23:32:13 UTC (rev 116129) @@ -3,7 +3,7 @@ pkgname=docker pkgver=1.1.1 -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc='Pack, ship and run any application as a lightweight container' arch=('x86_64') @@ -39,10 +39,15 @@ install -Dm644 'contrib/completion/bash/docker' "$pkgdir/usr/share/bash-completion/completions/docker" install -Dm644 'contrib/completion/zsh/_docker' "$pkgdir/usr/share/zsh/site-functions/_docker" # systemd - install -Dm644 'contrib/init/systemd/docker.service' "$pkgdir/usr/lib/systemd/system/docker.service" + install -Dm644 'contrib/init/systemd/socket-activation/docker.service' \ + "$pkgdir/usr/lib/systemd/system/docker.service" + install -Dm644 'contrib/init/systemd/socket-activation/docker.socket' \ + "$pkgdir/usr/lib/systemd/system/docker.socket" # vim syntax - install -Dm644 'contrib/syntax/vim/syntax/dockerfile.vim' "$pkgdir/usr/share/vim/vimfiles/syntax/dockerfile.vim" - install -Dm644 'contrib/syntax/vim/ftdetect/dockerfile.vim' "$pkgdir/usr/share/vim/vimfiles/dockerfile.vim" + install -Dm644 'contrib/syntax/vim/syntax/dockerfile.vim' \ + "$pkgdir/usr/share/vim/vimfiles/syntax/dockerfile.vim" + install -Dm644 'contrib/syntax/vim/ftdetect/dockerfile.vim' \ + "$pkgdir/usr/share/vim/vimfiles/ftdetect/dockerfile.vim" } # vim:set ts=2 sw=2 et: Modified: docker.install =================================================================== --- docker.install 2014-07-22 23:16:12 UTC (rev 116128) +++ docker.install 2014-07-22 23:32:13 UTC (rev 116129) @@ -8,6 +8,7 @@ # arg 2: the old package version post_upgrade() { (( $(vercmp $2 '1:0.7.1-1') < 0 )) && post_install "$1" || true + (( $(vercmp $2 '1:1.1.1-2') < 0 )) && socketactivation || true } # arg 1: the old package version @@ -15,4 +16,14 @@ groupdel docker >/dev/null 2>&1 || true } +socketactivation() { + if systemctl -q is-enabled docker; then + cat << EOF +The docker service switched to socket activation. +We will enable the socket file for you. Don't need to thanks us. +EOF + systemctl enable docker.socket + fi +} + # vim:set ts=2 sw=2 et: