rpm/libguestfs
SHA256
1
0
Fork 0
forked from pool/libguestfs
Code Pull Requests Activity

- stick to upstream defaults:

Browse Source 
restore default attach mode, which is appliance,

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=157
This commit is contained in:
Olaf Hering 2012-11-14 19:23:41 +00:00 committed by Git OBS Bridge
parent 272ffbad46
commit cbafb3ebfd
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libguestfs.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Nov 14 20:22:19 CET 2012 - ohering@suse.de
- stick to upstream defaults:
restore default attach mode, which is appliance,
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 14 17:51:16 CET 2012 - ohering@suse.de Wed Nov 14 17:51:16 CET 2012 - ohering@suse.de

4
libguestfs.spec
View File

@ -365,15 +365,12 @@ CFLAGS="$RPM_OPT_FLAGS -Wno-unused"
CXXFLAGS="$RPM_OPT_FLAGS -Wno-unused" CXXFLAGS="$RPM_OPT_FLAGS -Wno-unused"
# If the kernel happens to have no virtio-scsi force virtio-blk usage in the tools # If the kernel happens to have no virtio-scsi force virtio-blk usage in the tools
# This is true for kernel.rpm included in 12.1 and older # This is true for kernel.rpm included in 12.1 and older
# Force also attach method "appliance" because constructing libvirt xml is cumbersome for virtio-blk
if /sbin/modinfo -k `env PATH=/sbin:/usr/sbin:$PATH get_kernel_version /boot/vmlinuz` virtio-scsi if /sbin/modinfo -k `env PATH=/sbin:/usr/sbin:$PATH get_kernel_version /boot/vmlinuz` virtio-scsi
then then
: use virtio-scsi, which is the default in libguestfs : use virtio-scsi, which is the default in libguestfs
default_attach_method="libvirt"
else else
CFLAGS="$CFLAGS -DGUESTFS_QEMU_NO_VIRTIO_BLK" CFLAGS="$CFLAGS -DGUESTFS_QEMU_NO_VIRTIO_BLK"
CXXFLAGS="$CXXFLAGS -DGUESTFS_QEMU_NO_VIRTIO_BLK" CXXFLAGS="$CXXFLAGS -DGUESTFS_QEMU_NO_VIRTIO_BLK"
default_attach_method="appliance"
fi fi
# #
%configure \ %configure \
@ -383,7 +380,6 @@ fi
--docdir=%{guestfs_docdir} \ --docdir=%{guestfs_docdir} \
--enable-daemon \ --enable-daemon \
--enable-install-daemon \ --enable-install-daemon \
--with-default-attach-method="${default_attach_method}" \
--with-qemu=$QEMU \ --with-qemu=$QEMU \
--without-java \ --without-java \
--disable-appliance \ --disable-appliance \