External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-01 17:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

* libvirt.spec.in proxy/Makefile.am: do the chown at the rpm packaging

Browse Source 
level, to allow build as non-root
* src/xml.c: fix bug #197583 raised by markmc
Daniel
This commit is contained in:
Daniel Veillard 2006-07-04 12:46:14 +00:00
parent 567b42ce6a
commit 4fcc208fa4
4 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Tue Jul 4 13:50:55 CEST 2006 Daniel Veillard <veillard@redhat.com>
* libvirt.spec.in proxy/Makefile.am: do the chown at the rpm packaging
level, to allow build as non-root
* src/xml.c: fix bug #197583 raised by markmc
Mon Jul 3 15:41:58 EDT 2006 Daniel Veillard <veillard@redhat.com> Mon Jul 3 15:41:58 EDT 2006 Daniel Veillard <veillard@redhat.com>
* NEWS docs/* configure.in libvirt.spec.in include/libvirt/libvirt.h: * NEWS docs/* configure.in libvirt.spec.in include/libvirt/libvirt.h:

4
libvirt.spec.in
View File

@ -14,7 +14,7 @@ Requires: readline
BuildRequires: libxml2-devel BuildRequires: libxml2-devel
BuildRequires: readline-devel BuildRequires: readline-devel
Obsoletes: libvir Obsoletes: libvir
ExclusiveArch: i386 x86_64 ia64 ExclusiveArch: i386 x86_64
%description %description
This C library provides an API to use the Xen virtualization framework, This C library provides an API to use the Xen virtualization framework,
@ -75,7 +75,7 @@ rm -fr %{buildroot}
%doc %{_mandir}/man1/virsh.1* %doc %{_mandir}/man1/virsh.1*
%{_bindir}/virsh %{_bindir}/virsh
%{_libdir}/lib*.so.* %{_libdir}/lib*.so.*
%{_libexecdir}/libvirt_proxy %attr(4755, root, root) %{_libexecdir}/libvirt_proxy
%files devel %files devel
%defattr(-, root, root) %defattr(-, root, root)

1
proxy/Makefile.am
View File

@ -16,5 +16,4 @@ libvirt_proxy_DEPENDENCIES =
libvirt_proxy_LDADD = libvirt_proxy_LDADD =
install-exec-hook: install-exec-hook:
chown root:root $(DESTDIR)$(libexecdir)/libvirt_proxy
chmod u+s $(DESTDIR)$(libexecdir)/libvirt_proxy chmod u+s $(DESTDIR)$(libexecdir)/libvirt_proxy

15
src/xml.c
View File

@ -591,27 +591,32 @@ virDomainParseXMLOSDesc(xmlNodePtr node, virBufferPtr buf, int bootloader)
if ((type == NULL) if ((type == NULL)
&& (xmlStrEqual(cur->name, BAD_CAST "type"))) { && (xmlStrEqual(cur->name, BAD_CAST "type"))) {
txt = cur->children; txt = cur->children;
if ((txt->type == XML_TEXT_NODE) && (txt->next == NULL)) if ((txt != NULL) && (txt->type == XML_TEXT_NODE) &&
(txt->next == NULL))
type = txt->content; type = txt->content;
} else if ((kernel == NULL) && } else if ((kernel == NULL) &&
(xmlStrEqual(cur->name, BAD_CAST "kernel"))) { (xmlStrEqual(cur->name, BAD_CAST "kernel"))) {
txt = cur->children; txt = cur->children;
if ((txt->type == XML_TEXT_NODE) && (txt->next == NULL)) if ((txt != NULL) && (txt->type == XML_TEXT_NODE) &&
(txt->next == NULL))
kernel = txt->content; kernel = txt->content;
} else if ((root == NULL) && } else if ((root == NULL) &&
(xmlStrEqual(cur->name, BAD_CAST "root"))) { (xmlStrEqual(cur->name, BAD_CAST "root"))) {
txt = cur->children; txt = cur->children;
if ((txt->type == XML_TEXT_NODE) && (txt->next == NULL)) if ((txt != NULL) && (txt->type == XML_TEXT_NODE) &&
(txt->next == NULL))
root = txt->content; root = txt->content;
} else if ((initrd == NULL) && } else if ((initrd == NULL) &&
(xmlStrEqual(cur->name, BAD_CAST "initrd"))) { (xmlStrEqual(cur->name, BAD_CAST "initrd"))) {
txt = cur->children; txt = cur->children;
if ((txt->type == XML_TEXT_NODE) && (txt->next == NULL)) if ((txt != NULL) && (txt->type == XML_TEXT_NODE) &&
(txt->next == NULL))
initrd = txt->content; initrd = txt->content;
} else if ((cmdline == NULL) && } else if ((cmdline == NULL) &&
(xmlStrEqual(cur->name, BAD_CAST "cmdline"))) { (xmlStrEqual(cur->name, BAD_CAST "cmdline"))) {
txt = cur->children; txt = cur->children;
if ((txt->type == XML_TEXT_NODE) && (txt->next == NULL)) if ((txt != NULL) && (txt->type == XML_TEXT_NODE) &&
(txt->next == NULL))
cmdline = txt->content; cmdline = txt->content;
} }
} }