diff --git a/lxc/trunk/PKGBUILD b/lxc/trunk/PKGBUILD index cdf84b0..d8db619 100644 --- a/lxc/trunk/PKGBUILD +++ b/lxc/trunk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 126827 2015-01-30 16:45:38Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Andrea Zucchelli # Contributor: Daniel Micay @@ -26,11 +26,13 @@ validpgpkeys=('602F567663E593BCBD14F338C638974D64792D67') source=("http://linuxcontainers.org/downloads/$pkgname-${pkgver}.tar.gz"{,.asc} "lxc.tmpfiles.d" "lxc.service" + "lxc-net.service" "lxc-auto.service") md5sums=('ab1cbabf859abc15165050c854979c5c' 'SKIP' 'df94c9fb8a753011c86ee664e9f521ff' '4b41aa53ee714c60f0309541d2e9ea15' + 'c0c7d82cc7eda9673d251804cfa449b0' '5566d9bd868adf26b19d59f9f77bec95') prepare() { @@ -55,7 +57,7 @@ build() { --enable-cgmanager \ --enable-capabilities \ --enable-lua \ - --with-init-script=systemd \ + --with-init-script=none \ --with-systemdsystemunitdir=/usr/lib make } @@ -69,6 +71,7 @@ package() { install -D -m644 ${srcdir}/lxc.service ${pkgdir}/usr/lib/systemd/system/lxc@.service install -D -m644 ${srcdir}/lxc-auto.service ${pkgdir}/usr/lib/systemd/system/lxc-auto.service install -D -m644 ${srcdir}/lxc.tmpfiles.d ${pkgdir}/usr/lib/tmpfiles.d/lxc.conf + install -D -m644 ${srcdir}/lxc-net.service ${pkgdir}/usr/lib/systemd/system/lxc-net.service cd doc find . -type f -name '*.1' -exec install -D -m644 "{}" "$pkgdir/usr/share/man/man1/{}" \; diff --git a/lxc/trunk/lxc-net.service b/lxc/trunk/lxc-net.service new file mode 100644 index 0000000..c97f955 --- /dev/null +++ b/lxc/trunk/lxc-net.service @@ -0,0 +1,12 @@ +[Unit] +Description=LXC network bridge setup +After=network.target + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=/usr/lib/lxc/lxc-net start +ExecStop=/usr/lib/lxc/lxc-net stop + +[Install] +WantedBy=multi-user.target