diff --git a/sys-apps/calculate-toolkit/calculate-toolkit-0.3.0-r20.ebuild b/sys-apps/calculate-toolkit/calculate-toolkit-0.3.0-r21.ebuild similarity index 97% rename from sys-apps/calculate-toolkit/calculate-toolkit-0.3.0-r20.ebuild rename to sys-apps/calculate-toolkit/calculate-toolkit-0.3.0-r21.ebuild index 63a936ec2..53456722a 100644 --- a/sys-apps/calculate-toolkit/calculate-toolkit-0.3.0-r20.ebuild +++ b/sys-apps/calculate-toolkit/calculate-toolkit-0.3.0-r21.ebuild @@ -40,4 +40,5 @@ PATCHES=( "${FILESDIR}"/${P}-clear_cache.patch "${FILESDIR}"/${P}-mac.patch "${FILESDIR}"/${P}-unique_veth_pair.patch + "${FILESDIR}"/${P}-noop_net.patch ) diff --git a/sys-apps/calculate-toolkit/files/calculate-toolkit-0.3.0-noop_net.patch b/sys-apps/calculate-toolkit/files/calculate-toolkit-0.3.0-noop_net.patch new file mode 100644 index 000000000..83809b5d5 --- /dev/null +++ b/sys-apps/calculate-toolkit/files/calculate-toolkit-0.3.0-noop_net.patch @@ -0,0 +1,19 @@ +diff --git a/cl-lxc b/cl-lxc +index 099a0ce..2cee054 100755 +--- a/cl-lxc ++++ b/cl-lxc +@@ -477,12 +477,13 @@ create_lxc() { + net_conf=none + network_conf="lxc.net.0.type = none" + cp /etc/resolv.conf $path_lxc/rootfs/etc ++ echo -e "\nconfig_eth0=\"noop\"" >> $path_lxc/rootfs/etc/conf.d/net + 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 veth_pair="lxc.net.0.veth.pair = lxc-${name_lxc::11}" +- if grep -q "$veth_pair" -r ${path_def}/*/config ++ if grep -q "$veth_pair" -r ${path_def}/*/config &>/dev/null + then + # исключим настройку сетевого имени, если такое уже используется + veth_pair="#${veth_pair}" diff --git a/sys-apps/calculate-toolkit/files/patch b/sys-apps/calculate-toolkit/files/patch new file mode 100644 index 000000000..83809b5d5 --- /dev/null +++ b/sys-apps/calculate-toolkit/files/patch @@ -0,0 +1,19 @@ +diff --git a/cl-lxc b/cl-lxc +index 099a0ce..2cee054 100755 +--- a/cl-lxc ++++ b/cl-lxc +@@ -477,12 +477,13 @@ create_lxc() { + net_conf=none + network_conf="lxc.net.0.type = none" + cp /etc/resolv.conf $path_lxc/rootfs/etc ++ echo -e "\nconfig_eth0=\"noop\"" >> $path_lxc/rootfs/etc/conf.d/net + 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 veth_pair="lxc.net.0.veth.pair = lxc-${name_lxc::11}" +- if grep -q "$veth_pair" -r ${path_def}/*/config ++ if grep -q "$veth_pair" -r ${path_def}/*/config &>/dev/null + then + # исключим настройку сетевого имени, если такое уже используется + veth_pair="#${veth_pair}"