forked from calculate/calculate-overlay
parent
c4b36d5cf8
commit
1bdf5e6d63
@ -0,0 +1,43 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="7"
|
||||
PYTHON_COMPAT=( python3_{9..10} )
|
||||
|
||||
SRC_URI="https://git.calculate-linux.org/calculate/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
DESCRIPTION="Collection of administration scripts for Calculate"
|
||||
HOMEPAGE="https://www.calculate-linux.org"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
S=${WORKDIR}/${PN}
|
||||
|
||||
RDEPEND=">=sys-apps/calculate-utils-3.6
|
||||
app-arch/zstd
|
||||
app-arch/xz-utils"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-check-lxc.patch
|
||||
"${FILESDIR}"/${P}-workdir.patch
|
||||
"${FILESDIR}"/${P}-no-validate.patch
|
||||
"${FILESDIR}"/${P}-root.patch
|
||||
"${FILESDIR}"/${P}-var.patch
|
||||
"${FILESDIR}"/${P}-clear.patch
|
||||
"${FILESDIR}"/${P}-restore-init.patch
|
||||
"${FILESDIR}"/${P}-skipcom.patch
|
||||
"${FILESDIR}"/${P}-fix-ccg.patch
|
||||
"${FILESDIR}"/${P}-check_mkdir.patch
|
||||
"${FILESDIR}"/${P}-ssh_keys.patch
|
||||
"${FILESDIR}"/${P}-check_files.patch
|
||||
"${FILESDIR}"/${P}-cdc.patch
|
||||
"${FILESDIR}"/${P}-cdc_support.patch
|
||||
"${FILESDIR}"/${P}-gentoo.patch
|
||||
"${FILESDIR}"/${P}-pruning.patch
|
||||
"${FILESDIR}"/${P}-clear_cache.patch
|
||||
"${FILESDIR}"/${P}-mac.patch
|
||||
"${FILESDIR}"/${P}-unique_veth_pair.patch
|
||||
)
|
@ -0,0 +1,27 @@
|
||||
diff --git a/cl-lxc b/cl-lxc
|
||||
index 9072aed..099a0ce 100755
|
||||
--- a/cl-lxc
|
||||
+++ b/cl-lxc
|
||||
@@ -479,13 +479,20 @@ create_lxc() {
|
||||
cp /etc/resolv.conf $path_lxc/rootfs/etc
|
||||
else
|
||||
net_conf=veth
|
||||
- local random_mac=$(printf '06:%02X:%02X:%02X:%02X:%02X\n' $[RANDOM%256] $[RANDOM%256] $[RANDOM%256] $[RANDOM%256] $[RANDOM%256])
|
||||
+ local random_mac=$(printf '06:%02X:%02X:%02X:%02X:%02X\n' \
|
||||
+ $[RANDOM%256] $[RANDOM%256] $[RANDOM%256] $[RANDOM%256] $[RANDOM%256])
|
||||
+ local veth_pair="lxc.net.0.veth.pair = lxc-${name_lxc::11}"
|
||||
+ if grep -q "$veth_pair" -r ${path_def}/*/config
|
||||
+ then
|
||||
+ # исключим настройку сетевого имени, если такое уже используется
|
||||
+ veth_pair="#${veth_pair}"
|
||||
+ fi
|
||||
network_conf="lxc.net.0.type = veth
|
||||
lxc.net.0.flags = up
|
||||
lxc.net.0.name = eth0
|
||||
lxc.net.0.link = br0
|
||||
lxc.net.0.hwaddr = ${random_mac}
|
||||
-lxc.net.0.veth.pair = lxc-${name_lxc}"
|
||||
+${veth_pair}"
|
||||
fi
|
||||
|
||||
# перенесем базовый config удалив настройку сети
|
Loading…
Reference in new issue