[libvirt] [PATCH] Convert HAVE_SELINUX to WITH_SELINUX
these were missed by 63f18f378693cac6b6e33f4a8c15c20cb191c7c8 --- src/lxc/lxc_container.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 7ec67f4..4d09791 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1927,7 +1927,7 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef, if (lxcContainerPivotRoot(root) < 0) goto cleanup; -#if HAVE_SELINUX +#if WITH_SELINUX /* Some versions of Linux kernel don't let you overmount * the selinux filesystem, so make sure we kill it first */ @@ -2039,7 +2039,7 @@ static int lxcContainerSetupExtraMounts(virDomainDefPtr vmDef, if (lxcContainerIdentifyCGroups(&mounts, &nmounts, &cgroupRoot) < 0) goto cleanup; -#if HAVE_SELINUX +#if WITH_SELINUX /* Some versions of Linux kernel don't let you overmount * the selinux filesystem, so make sure we kill it first */ -- 1.7.10.4
On 2013年03月09日 23:08, Guido Günther wrote:
these were missed by 63f18f378693cac6b6e33f4a8c15c20cb191c7c8 --- src/lxc/lxc_container.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 7ec67f4..4d09791 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1927,7 +1927,7 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef, if (lxcContainerPivotRoot(root)< 0) goto cleanup;
-#if HAVE_SELINUX +#if WITH_SELINUX /* Some versions of Linux kernel don't let you overmount * the selinux filesystem, so make sure we kill it first */ @@ -2039,7 +2039,7 @@ static int lxcContainerSetupExtraMounts(virDomainDefPtr vmDef, if (lxcContainerIdentifyCGroups(&mounts,&nmounts,&cgroupRoot)< 0) goto cleanup;
-#if HAVE_SELINUX +#if WITH_SELINUX /* Some versions of Linux kernel don't let you overmount * the selinux filesystem, so make sure we kill it first */
ACK.
On Mon, Mar 11, 2013 at 09:54:42AM +0800, Osier Yang wrote:
On 2013年03月09日 23:08, Guido Günther wrote:
these were missed by 63f18f378693cac6b6e33f4a8c15c20cb191c7c8 --- src/lxc/lxc_container.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 7ec67f4..4d09791 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1927,7 +1927,7 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef, if (lxcContainerPivotRoot(root)< 0) goto cleanup;
-#if HAVE_SELINUX +#if WITH_SELINUX /* Some versions of Linux kernel don't let you overmount * the selinux filesystem, so make sure we kill it first */ @@ -2039,7 +2039,7 @@ static int lxcContainerSetupExtraMounts(virDomainDefPtr vmDef, if (lxcContainerIdentifyCGroups(&mounts,&nmounts,&cgroupRoot)< 0) goto cleanup;
-#if HAVE_SELINUX +#if WITH_SELINUX /* Some versions of Linux kernel don't let you overmount * the selinux filesystem, so make sure we kill it first */
ACK. Pushed thanks, -- Guido
participants (2)
-
Guido Günther -
Osier Yang