File _service:gitpkg:0019-Update-lxc-create-and-lxc-... of Package build

Overview Repositories Revisions Requests Users Attributes Meta

File _service:gitpkg:0019-Update-lxc-create-and-lxc-start-options-to-work-with.patch of Package build

From 3c61c89d8b6ff871c12eee9b40969c83814a60f5 Mon Sep 17 00:00:00 2001
From: Oleg Girko <ol@infoserver.lv>
Date: Mon, 26 Oct 2015 02:03:20 +0000
Subject: [PATCH] Update lxc-create and lxc-start options to work with newer
 lxc.

There are changes in lxc-create and lxc-start options in lxc 1.1:
* lxc-create now requires "-t" option to specify template;
* lxc-start now defaults to run in daemon mode, needs "-F" option to override.

Signed-off-by: Oleg Girko <ol@infoserver.lv>
---
 build-vm-lxc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build-vm-lxc b/build-vm-lxc
index 2cc786f..4ac9c3f 100644
--- a/build-vm-lxc
+++ b/build-vm-lxc
@@ -51,8 +51,8 @@ vm_startup_lxc() {
 	mount --bind "$BUILD_ROOT" "$LXCROOTFS"
 	EOF
     chmod a+x "$LXCHOOK"
-    lxc-create -n "$LXCID" -f "$LXCCONF" || cleanup_and_exit 1
-    lxc-start -n "$LXCID" "$vm_init_script"
+    lxc-create -n "$LXCID" -t none -f "$LXCCONF" || cleanup_and_exit 1
+    lxc-start -n "$LXCID" -F "$vm_init_script"
     BUILDSTATUS="$?"
     test "$BUILDSTATUS" != 255 || BUILDSTATUS=3
     cleanup_and_exit "$BUILDSTATUS"
-- 
2.1.0

Places

File _service:gitpkg:0019-Update-lxc-create-and-lxc-start-options-to-work-with.patch of Package build

Places