|
 |
c401cc |
From b45d3910972d3c962ddd2e50defdaf59dd4d4620 Mon Sep 17 00:00:00 2001
|
|
|
c401cc |
Message-Id: <b45d3910972d3c962ddd2e50defdaf59dd4d4620@dist-git>
|
|
|
c401cc |
From: Eric Blake <eblake@redhat.com>
|
|
|
c401cc |
Date: Tue, 18 Feb 2014 15:45:29 -0700
|
|
|
c401cc |
Subject: [PATCH] maint: fix comment typos
|
|
|
c401cc |
|
|
|
c401cc |
https://bugzilla.redhat.com/show_bug.cgi?id=1045643
|
|
|
c401cc |
prereq of CVE-2013-6456
|
|
|
c401cc |
|
|
|
c401cc |
* src/lxc/lxc_controller.c (virLXCControllerSetupDisk): Fix typo.
|
|
|
c401cc |
* src/lxc/lxc_driver.c (lxcDomainAttachDeviceDiskLive): Likewise.
|
|
|
c401cc |
|
|
|
c401cc |
Signed-off-by: Eric Blake <eblake@redhat.com>
|
|
|
c401cc |
(cherry picked from commit 8de47efd3fdb27d99bc457cc4163d7b5f8595268)
|
|
|
c401cc |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
c401cc |
---
|
|
|
c401cc |
src/lxc/lxc_controller.c | 2 +-
|
|
|
c401cc |
src/lxc/lxc_driver.c | 2 +-
|
|
|
c401cc |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
c401cc |
|
|
|
c401cc |
diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
|
|
|
c401cc |
index cb2db82..1200bf1 100644
|
|
|
c401cc |
--- a/src/lxc/lxc_controller.c
|
|
|
c401cc |
+++ b/src/lxc/lxc_controller.c
|
|
|
c401cc |
@@ -1699,7 +1699,7 @@ static int virLXCControllerSetupDisk(virLXCControllerPtr ctrl,
|
|
|
c401cc |
goto cleanup;
|
|
|
c401cc |
|
|
|
c401cc |
/* Labelling normally operates on src, but we need
|
|
|
c401cc |
- * to actally label the dst here, so hack the config */
|
|
|
c401cc |
+ * to actually label the dst here, so hack the config */
|
|
|
c401cc |
def->src = dst;
|
|
|
c401cc |
if (virSecurityManagerSetImageLabel(securityDriver, ctrl->def, def) < 0)
|
|
|
c401cc |
goto cleanup;
|
|
|
c401cc |
diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
|
|
|
c401cc |
index a6efaa4..48456ad 100644
|
|
|
c401cc |
--- a/src/lxc/lxc_driver.c
|
|
|
c401cc |
+++ b/src/lxc/lxc_driver.c
|
|
|
c401cc |
@@ -3145,7 +3145,7 @@ lxcDomainAttachDeviceDiskLive(virLXCDriverPtr driver,
|
|
|
c401cc |
created = true;
|
|
|
c401cc |
|
|
|
c401cc |
/* Labelling normally operates on src, but we need
|
|
|
c401cc |
- * to actally label the dst here, so hack the config */
|
|
|
c401cc |
+ * to actually label the dst here, so hack the config */
|
|
|
c401cc |
def->src = dst;
|
|
|
c401cc |
if (virSecurityManagerSetImageLabel(driver->securityManager,
|
|
|
c401cc |
vm->def, def) < 0)
|
|
|
c401cc |
--
|
|
|
c401cc |
1.9.0
|
|
|
c401cc |
|