Revision 7a562e5e
| b/lib/hypervisor/hv_kvm.py | ||
|---|---|---|
| 60 | 60 |
from ganeti.utils import wrapper as utils_wrapper |
| 61 | 61 |
|
| 62 | 62 |
|
| 63 |
_KVM_NETWORK_SCRIPT = pathutils.CONF_DIR + "/kvm-vif-bridge"
|
|
| 63 |
_KVM_NETWORK_SCRIPT = pathutils.CONF_DIR + "/kvm-ifup-custom"
|
|
| 64 | 64 |
_KVM_START_PAUSED_FLAG = "-S" |
| 65 | 65 |
|
| 66 | 66 |
# TUN/TAP driver constants, taken from <linux/if_tun.h> |
| b/tools/kvm-ifdown.in | ||
|---|---|---|
| 21 | 21 |
source @PKGLIBDIR@/net-common |
| 22 | 22 |
|
| 23 | 23 |
# Execute the user-supplied network script, if applicable |
| 24 |
if [ -x "$CONF_DIR/ganeti-kvm-ifdown" ]; then
|
|
| 25 |
exec $CONF_DIR/ganeti-kvm-ifdown
|
|
| 24 |
if [ -x "$CONF_DIR/kvm-ifdown-custom" ]; then
|
|
| 25 |
exec $CONF_DIR/kvm-ifdown-custom "$@"
|
|
| 26 | 26 |
fi |
| 27 | 27 |
|
| 28 | 28 |
exit 0 |
| b/tools/kvm-ifup.in | ||
|---|---|---|
| 21 | 21 |
source @PKGLIBDIR@/net-common |
| 22 | 22 |
|
| 23 | 23 |
# Execute the user-supplied network script, if applicable |
| 24 |
if [ -x "$CONF_DIR/kvm-vif-bridge" ]; then
|
|
| 25 |
exec $CONF_DIR/kvm-vif-bridge
|
|
| 24 |
if [ -x "$CONF_DIR/kvm-ifup-custom" ]; then
|
|
| 25 |
exec $CONF_DIR/kvm-ifup-custom "$@"
|
|
| 26 | 26 |
fi |
| 27 | 27 |
|
| 28 | 28 |
check |
Also available in: Unified diff