You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
calculate-overlay/sys-apps/calculate-toolkit/files/calculate-toolkit-0.3.0-uni...

28 lines
1.0 KiB

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 удалив настройку сети