diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2017-05-23 15:22:15 +0200 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-05-23 15:22:15 +0200 |
commit | 2604d2f13b95a35836fe9d8a7e733635300c346c (patch) | |
tree | da56146fda1300d9a06717f1e9359f92d1ddbd4d | |
parent | ce44a928921cd0c87be29f2fc6aa10d200456aab (diff) | |
download | alpine_aports-2604d2f13b95a35836fe9d8a7e733635300c346c.tar.bz2 alpine_aports-2604d2f13b95a35836fe9d8a7e733635300c346c.tar.xz alpine_aports-2604d2f13b95a35836fe9d8a7e733635300c346c.zip |
main/lxc: fix lxc-bridge config
-rw-r--r-- | main/lxc/APKBUILD | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/main/lxc/APKBUILD b/main/lxc/APKBUILD index 381d4c832c..6e3185bd20 100644 --- a/main/lxc/APKBUILD +++ b/main/lxc/APKBUILD | |||
@@ -5,7 +5,7 @@ | |||
5 | pkgname=lxc | 5 | pkgname=lxc |
6 | pkgver=2.0.7 | 6 | pkgver=2.0.7 |
7 | _pkgver=${pkgver/_rc/.rc} | 7 | _pkgver=${pkgver/_rc/.rc} |
8 | pkgrel=3 | 8 | pkgrel=4 |
9 | pkgdesc="Userspace interface for the Linux kernel containment features" | 9 | pkgdesc="Userspace interface for the Linux kernel containment features" |
10 | url="https://linuxcontainers.org/lxc/" | 10 | url="https://linuxcontainers.org/lxc/" |
11 | arch="all" | 11 | arch="all" |
@@ -127,7 +127,7 @@ bridge() { | |||
127 | "$subpkgdir"/etc/lxc | 127 | "$subpkgdir"/etc/lxc |
128 | 128 | ||
129 | ln -s dnsmasq "$subpkgdir"/etc/init.d/dnsmasq.lxcbr0 | 129 | ln -s dnsmasq "$subpkgdir"/etc/init.d/dnsmasq.lxcbr0 |
130 | cat ->>"$subpkgdir"/etc/conf.d/dnsmasq.lxcbr0 <<EOF | 130 | cat >>"$subpkgdir"/etc/conf.d/dnsmasq.lxcbr0 <<- EOF |
131 | BRIDGE_ADDR="10.0.3.1" | 131 | BRIDGE_ADDR="10.0.3.1" |
132 | BRIDGE_NETMASK="255.255.255.0" | 132 | BRIDGE_NETMASK="255.255.255.0" |
133 | BRIDGE_NETWORK="10.0.3.0/24" | 133 | BRIDGE_NETWORK="10.0.3.0/24" |
@@ -136,12 +136,12 @@ bridge() { | |||
136 | BRIDGE_MAC="00:16:3e:00:00:00" | 136 | BRIDGE_MAC="00:16:3e:00:00:00" |
137 | DNSMASQ_CONFFILE="/etc/lxc/dnsmasq.conf" | 137 | DNSMASQ_CONFFILE="/etc/lxc/dnsmasq.conf" |
138 | EOF | 138 | EOF |
139 | cat ->>"$subpkgdir"/etc/lxc/dnsmasq.conf <<EOF | 139 | cat >>"$subpkgdir"/etc/lxc/dnsmasq.conf <<- EOF |
140 | #dhcp-host=somehost,10.0.3.3 | 140 | #dhcp-host=somehost,10.0.3.3 |
141 | #dhcp-host=otherhost,10.0.3.4 | 141 | #dhcp-host=otherhost,10.0.3.4 |
142 | EOF | 142 | EOF |
143 | cat ->>"$subpkgdir"/etc/conf.d/lxc <<EOF | 143 | cat >>"$subpkgdir"/etc/conf.d/lxc <<- EOF |
144 | rc_need="lxc-bridge" | 144 | rc_need="dnsmasq.lxcbr0" |
145 | EOF | 145 | EOF |
146 | 146 | ||
147 | } | 147 | } |