forked from pool/libvirt
James Fehlig
938f073a9b
- CVE-2015-5313: don't allow '/' in filesystem volume names
034e47c3-CVE-2015-5313.patch
bsc#953110
- Fix failing qemuxml2argv test on 32-bit platforms
ace1ee22-qemuxml2argv-test.patch
- Update to libvirt 1.3.0
- New virtlogd log daemon
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patch: 703ec1b7-qemu-bridge-helper-fix.patch
- Added patch: virtlogd-init-script.patch
OBS-URL: https://build.opensuse.org/request/show/349565
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=505
80 lines
2.4 KiB
Diff
80 lines
2.4 KiB
Diff
From 5f42064688d5e2c81b623ef20c243c77f2094193 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cbosdonnat@suse.com>
|
|
Date: Mon, 9 Nov 2015 15:36:40 -0700
|
|
Subject: [PATCH] Allow building lxc without virt-login-shell
|
|
|
|
Add a configure option to disable virt-login-shell build even if lxc is
|
|
enabled.
|
|
---
|
|
configure.ac | 14 ++++++++++++++
|
|
tools/Makefile.am | 12 ++++++------
|
|
2 files changed, 20 insertions(+), 6 deletions(-)
|
|
|
|
Index: libvirt-1.3.0/configure.ac
|
|
===================================================================
|
|
--- libvirt-1.3.0.orig/configure.ac
|
|
+++ libvirt-1.3.0/configure.ac
|
|
@@ -1074,6 +1074,19 @@ if test "$with_lxc" = "yes" ; then
|
|
fi
|
|
AM_CONDITIONAL([WITH_LXC], [test "$with_lxc" = "yes"])
|
|
|
|
+AC_ARG_WITH([login_shell],
|
|
+ [AS_HELP_STRING([--with-login-shell],
|
|
+ [build virt-login-shell @<:@default=yes@:>@])])
|
|
+m4_divert_text([DEFAULTS], [with_login_shell=yes])
|
|
+
|
|
+if test "$with_lxc" != "yes" ; then
|
|
+ with_login_shell="no"
|
|
+fi
|
|
+if test "$with_login_shell" ; then
|
|
+ AC_DEFINE_UNQUOTED([WITH_LOGIN_SHELL], 1, [whether virt-login-shell is built])
|
|
+fi
|
|
+AM_CONDITIONAL([WITH_LOGIN_SHELL], [test "$with_login_shell" = "yes"])
|
|
+
|
|
dnl
|
|
dnl Checks for the Parallels driver
|
|
dnl
|
|
@@ -2974,6 +2987,7 @@ AC_MSG_NOTICE([ Init script: $with_
|
|
AC_MSG_NOTICE([Char device locks: $with_chrdev_lock_files])
|
|
AC_MSG_NOTICE([ Default Editor: $DEFAULT_EDITOR])
|
|
AC_MSG_NOTICE([ Loader/NVRAM: $with_loader_nvram])
|
|
+AC_MSG_NOTICE([ virt-login-shell: $with_login_shell])
|
|
AC_MSG_NOTICE([])
|
|
AC_MSG_NOTICE([Developer Tools])
|
|
AC_MSG_NOTICE([])
|
|
Index: libvirt-1.3.0/tools/Makefile.am
|
|
===================================================================
|
|
--- libvirt-1.3.0.orig/tools/Makefile.am
|
|
+++ libvirt-1.3.0/tools/Makefile.am
|
|
@@ -71,12 +71,12 @@ sbin_SCRIPTS = virt-sanlock-cleanup
|
|
DISTCLEANFILES += virt-sanlock-cleanup
|
|
endif WITH_SANLOCK
|
|
|
|
-if WITH_LXC
|
|
+if WITH_LOGIN_SHELL
|
|
conf_DATA += virt-login-shell.conf
|
|
bin_PROGRAMS += virt-login-shell
|
|
-else ! WITH_LXC
|
|
+else ! WITH_LOGIN_SHELL
|
|
EXTRA_DIST += virt-login-shell.conf
|
|
-endif ! WITH_LXC
|
|
+endif ! WITH_LOGIN_SHELL
|
|
|
|
|
|
dist_man1_MANS = \
|
|
@@ -85,11 +85,11 @@ dist_man1_MANS = \
|
|
virt-xml-validate.1 \
|
|
virsh.1 \
|
|
virt-admin.1
|
|
-if WITH_LXC
|
|
+if WITH_LOGIN_SHELL
|
|
dist_man1_MANS += virt-login-shell.1
|
|
-else ! WITH_LXC
|
|
+else ! WITH_LOGIN_SHELL
|
|
EXTRA_DIST += virt-login-shell.1
|
|
-endif ! WITH_LXC
|
|
+endif ! WITH_LOGIN_SHELL
|
|
if WITH_SANLOCK
|
|
dist_man8_MANS = virt-sanlock-cleanup.8
|
|
endif WITH_SANLOCK
|