From cbafb3ebfd65ec620fb2f6d3010c96b4c8f9005e590f98f84d7dbfcf81fe7de3 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Wed, 14 Nov 2012 19:23:41 +0000 Subject: [PATCH] - stick to upstream defaults: restore default attach mode, which is appliance, OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=157 --- libguestfs.changes | 6 ++++++ libguestfs.spec | 4 ---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libguestfs.changes b/libguestfs.changes index 8063abe..55281bb 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -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 diff --git a/libguestfs.spec b/libguestfs.spec index 74f3d91..bee6c1c 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -365,15 +365,12 @@ CFLAGS="$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 # 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 then : use virtio-scsi, which is the default in libguestfs - default_attach_method="libvirt" else CFLAGS="$CFLAGS -DGUESTFS_QEMU_NO_VIRTIO_BLK" CXXFLAGS="$CXXFLAGS -DGUESTFS_QEMU_NO_VIRTIO_BLK" - default_attach_method="appliance" fi # %configure \ @@ -383,7 +380,6 @@ fi --docdir=%{guestfs_docdir} \ --enable-daemon \ --enable-install-daemon \ - --with-default-attach-method="${default_attach_method}" \ --with-qemu=$QEMU \ --without-java \ --disable-appliance \