diff --git a/1000-force-virtio_blk-in-old-guest-kernel.patch b/1000-force-virtio_blk-in-old-guest-kernel.patch index 193af6e..605c237 100644 --- a/1000-force-virtio_blk-in-old-guest-kernel.patch +++ b/1000-force-virtio_blk-in-old-guest-kernel.patch @@ -1,22 +1,22 @@ -From f010abe024b47057f814e369b7b647e52d001019 Mon Sep 17 00:00:00 2001 +From 5002a87860d2c0b40f8df64fba403f2eb67d2f97 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Mon, 3 Sep 2012 19:50:44 +0200 -Subject: [PATCH] force virtio_blk in old guest kernel +Subject: force virtio_blk in old guest kernel Signed-off-by: Olaf Hering --- - fish/options.c | 7 +++++-- - src/guestfs-internal.h | 1 + - src/handle.c | 16 ++++++++++++++++ - src/inspect-fs-unix.c | 4 ++-- - src/launch-direct.c | 2 ++ + fish/options.c | 7 +++++-- + src/guestfs-internal.h | 1 + + src/handle.c | 16 ++++++++++++++++ + src/inspect-fs-unix.c | 4 ++-- + src/launch-direct.c | 2 ++ 5 files changed, 26 insertions(+), 4 deletions(-) -Index: libguestfs-1.22.5/fish/options.c -=================================================================== ---- libguestfs-1.22.5.orig/fish/options.c -+++ libguestfs-1.22.5/fish/options.c -@@ -286,7 +286,10 @@ add_drives (struct drv *drv, char next_d +diff --git a/fish/options.c b/fish/options.c +index 75d61ad..b0bcd09 100644 +--- a/fish/options.c ++++ b/fish/options.c +@@ -80,7 +80,10 @@ add_drives (struct drv *drv, char next_drive) { int r; struct guestfs_add_drive_opts_argv ad_optargs; @@ -28,7 +28,7 @@ Index: libguestfs-1.22.5/fish/options.c if (next_drive > 'z') { fprintf (stderr, _("%s: too many drives added on the command line\n"), -@@ -300,7 +303,7 @@ add_drives (struct drv *drv, char next_d +@@ -94,7 +97,7 @@ add_drives (struct drv *drv, char next_drive) free (drv->device); drv->device = NULL; @@ -37,23 +37,23 @@ Index: libguestfs-1.22.5/fish/options.c perror ("asprintf"); exit (EXIT_FAILURE); } -Index: libguestfs-1.22.5/src/guestfs-internal.h -=================================================================== ---- libguestfs-1.22.5.orig/src/guestfs-internal.h -+++ libguestfs-1.22.5/src/guestfs-internal.h -@@ -432,6 +432,7 @@ struct guestfs_h - char *virt_selinux_label; - char *virt_selinux_imagelabel; - bool virt_selinux_norelabel_disks; +diff --git a/src/guestfs-internal.h b/src/guestfs-internal.h +index 9936c84..60b5509 100644 +--- a/src/guestfs-internal.h ++++ b/src/guestfs-internal.h +@@ -472,6 +472,7 @@ struct guestfs_h + unsigned int nr_requested_credentials; + virConnectCredentialPtr requested_credentials; + #endif + int use_virtio_blk; }; /* Per-filesystem data stored for inspect_os. */ -Index: libguestfs-1.22.5/src/handle.c -=================================================================== ---- libguestfs-1.22.5.orig/src/handle.c -+++ libguestfs-1.22.5/src/handle.c -@@ -230,6 +230,22 @@ parse_environment (guestfs_h *g, +diff --git a/src/handle.c b/src/handle.c +index fa96d95..e1732d7 100644 +--- a/src/handle.c ++++ b/src/handle.c +@@ -237,6 +237,22 @@ parse_environment (guestfs_h *g, } } @@ -76,11 +76,11 @@ Index: libguestfs-1.22.5/src/handle.c return 0; } -Index: libguestfs-1.22.5/src/inspect-fs-unix.c -=================================================================== ---- libguestfs-1.22.5.orig/src/inspect-fs-unix.c -+++ libguestfs-1.22.5/src/inspect-fs-unix.c -@@ -1404,7 +1404,7 @@ resolve_fstab_device_diskbyid (guestfs_h +diff --git a/src/inspect-fs-unix.c b/src/inspect-fs-unix.c +index 60b081d..33d5dac 100644 +--- a/src/inspect-fs-unix.c ++++ b/src/inspect-fs-unix.c +@@ -1404,7 +1404,7 @@ resolve_fstab_device_diskbyid (guestfs_h *g, const char *part, return 0; /* Make the partition name and check it exists. */ @@ -89,7 +89,7 @@ Index: libguestfs-1.22.5/src/inspect-fs-unix.c if (!is_partition (g, device)) { free (device); return 0; -@@ -1481,7 +1481,7 @@ resolve_fstab_device (guestfs_h *g, cons +@@ -1481,7 +1481,7 @@ resolve_fstab_device (guestfs_h *g, const char *spec, Hash_table *md_map) if (disk_i != -1 && disk_i <= 26 && slice_i > 0 && slice_i <= 1 /* > 4 .. see comment above */ && part_i >= 0 && part_i < 26) { @@ -98,16 +98,16 @@ Index: libguestfs-1.22.5/src/inspect-fs-unix.c } } else if ((part = match1 (g, spec, re_diskbyid)) != NULL) { -Index: libguestfs-1.22.5/src/launch-direct.c -=================================================================== ---- libguestfs-1.22.5.orig/src/launch-direct.c -+++ libguestfs-1.22.5/src/launch-direct.c -@@ -961,6 +961,8 @@ qemu_supports_virtio_scsi (guestfs_h *g) - g->direct.virtio_scsi = 3; +diff --git a/src/launch-direct.c b/src/launch-direct.c +index c809305..c417bc5 100644 +--- a/src/launch-direct.c ++++ b/src/launch-direct.c +@@ -1068,6 +1068,8 @@ qemu_supports_virtio_scsi (guestfs_h *g, struct backend_direct_data *data) + data->virtio_scsi = 3; } } + if (g->use_virtio_blk) -+ g->direct.virtio_scsi = 2; ++ data->virtio_scsi = 2; - return g->direct.virtio_scsi == 1; + return data->virtio_scsi == 1; } diff --git a/libguestfs-1.22.7.tar.xz b/libguestfs-1.22.7.tar.xz deleted file mode 100644 index a3d912e..0000000 --- a/libguestfs-1.22.7.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:456e2aad406914fbfa5122f119d6b448c2fb581002e4b93813ef4819bc587437 -size 4167580 diff --git a/libguestfs-1.24.1.tar.xz b/libguestfs-1.24.1.tar.xz new file mode 100644 index 0000000..df38b1f --- /dev/null +++ b/libguestfs-1.24.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:07b0c849f342d5b919577b86d926fe062e15cd3f08db1df756c7ec27257acbc7 +size 4565448 diff --git a/libguestfs.changes b/libguestfs.changes index 39cef91..08fa855 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Nov 26 11:27:04 CET 2013 - ohering@suse.de + +- Update to version 1.24.1 + * virt-resize & virt-sysprep can now use URIs to work on remote disks + * many new virt-sysprep operations + * many bug fixes + * full release notes: http://libguestfs.org/guestfs-release-notes.1.html +- guestfsd needs at least libaugeas0 >= 1.0.0 +- Recommend bash-completion to avoid completion errors + ------------------------------------------------------------------- Fri Oct 18 10:26:12 CEST 2013 - ohering@suse.de diff --git a/libguestfs.spec b/libguestfs.spec index 0bd6755..5520672 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -17,7 +17,7 @@ # -Version: 1.22.7 +Version: 1.24.1 Release: 0 %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) @@ -98,7 +98,7 @@ ExclusiveArch: %ix86 x86_64 ppc64 %endif BuildRequires: aaa_base BuildRequires: attr-devel -BuildRequires: augeas-devel +BuildRequires: augeas-devel >= 1.0.0 BuildRequires: autoconf BuildRequires: automake %if %{with bash_completion} @@ -179,6 +179,9 @@ Group: System/Filesystems Provides: %{name} = %{version} Obsoletes: %{name} < %{version} Requires: kvm >= 1.1 +%if %{with bash_completion} +Recommends: bash-completion >= 2.0 +%endif %if %{with perl_bindings} Requires: perl(Data::Dumper) Requires: perl(File::Basename) @@ -218,6 +221,7 @@ virtual machines. Summary: Daemon for the libguestfs appliance License: GPL-2.0 Group: System/Filesystems +Conflicts: libaugeas0 < 1.0.0 %description -n guestfsd guestfsd runs within the libguestfs appliance. It receives commands from the host @@ -497,7 +501,7 @@ fi make \ INSTALLDIRS=vendor \ LD_RUN_PATH= \ - %{?jobs:-j%jobs} + %{?_smp_mflags} %install %if !%opt @@ -760,5 +764,6 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/bash-completion %endif %{_mandir}/man1/* +%{_mandir}/man5/* %changelog