Andrey Vagin (3):
vzctl: pass vps_res in env_create_FN
vzctl: add ability to skip creation of veth devices
cpt: restore veth devices with correct names
include/env.h| 2 +-
include/types.h | 2 ++
scripts/vps-netns_dev_add.in | 5 -
scripts/vps-rst.in
Signed-off-by: Andrey Vagin
---
include/env.h | 2 +-
src/lib/hooks_ct.c | 4 ++--
src/lib/hooks_vz.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/env.h b/include/env.h
index 7426d63..67ab3ef 100644
--- a/include/env.h
+++ b/include/env.h
@@ -34,7 +34,7 @
It will be used for resuming CT with help CRIU.
CRIU restores veth devices and configures them inside CT,
so vzctl should configures them on the host side.
Signed-off-by: Andrey Vagin
---
include/types.h | 2 ++
scripts/vps-netns_dev_add.in | 5 -
src/lib/hooks_ct.c
transmit pair of veth names to criu via the option --veth-pair
Signed-off-by: Andrey Vagin
---
scripts/vps-rst.in | 14 --
src/lib/hooks_ct.c | 18 ++
2 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/scripts/vps-rst.in b/scripts/vps-rst.in
index b6c2f84
transmit pair of veth names to criu via the option --veth-pair
v2: unset IFS and delete eval from vps-rst
Signed-off-by: Andrey Vagin
---
scripts/vps-rst.in | 15 +--
src/lib/hooks_ct.c | 18 ++
2 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/scripts/