43a3b335a6
- lxc AppArmor profile now only restricting potentially dangerous accesses. fdo#886460 - added patches: * 9265f8ab-apparmor-lxc-rework.patch * 9b1e4cd5-skip-useless-apparmor-files.patch - virt-lxc-convert: force free to output values in bytes - added patches: * dba3432b-virt-lxc-convert-fix.patch - lxc: allow setting a custom name for container NICs as LXC is is able to do it. lxc-net-target-name.patch, lxc-net-target-name-conversion.patch, lxc-net-target-name-doc.patch OBS-URL: https://build.opensuse.org/request/show/241206 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=390
23 lines
904 B
Diff
23 lines
904 B
Diff
From 236a18572216a35f742824f4056108245fac3082 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cbosdonnat@suse.com>
|
|
Date: Fri, 4 Jul 2014 15:57:17 +0200
|
|
Subject: [PATCH] virt-lxc-convert: make free return values in bytes
|
|
|
|
---
|
|
examples/lxcconvert/virt-lxc-convert | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
Index: libvirt-1.2.5/examples/lxcconvert/virt-lxc-convert
|
|
===================================================================
|
|
--- libvirt-1.2.5.orig/examples/lxcconvert/virt-lxc-convert
|
|
+++ libvirt-1.2.5/examples/lxcconvert/virt-lxc-convert
|
|
@@ -64,7 +64,7 @@ if test -r "$fstab"; then
|
|
sed 's/^\([^#]\)/lxc.mount.entry = \1/' "$fstab" >>"${conf_new}"
|
|
fi
|
|
|
|
-memory=$(free | sed -n '/Mem:/s/ \+/ /gp' | cut -f 2 -d ' ')
|
|
+memory=$(free -b | sed -n '/Mem:/s/ \+/ /gp' | cut -f 2 -d ' ')
|
|
default_tmpfs="size=$((memory/2))"
|
|
|
|
# Do we have tmpfs without size param?
|