pool/libguestfs
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 284504 from home:cbosdonnat:branches:Virtualization

Browse Source 
Merging with hostfix patch

OBS-URL: https://build.opensuse.org/request/show/284504
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=332
This commit is contained in:
Cédric Bosdonnat 2015-02-06 15:27:36 +00:00 committed by Git OBS Bridge
parent b2e0d44130
commit ae6bbcfcef
4 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
0000-hotfix.patch
View File

@ -28,3 +28,17 @@ index 7a4d43d..ceea593 100644
ADD_ARG (argv, i, fs_buf); ADD_ARG (argv, i, fs_buf);
ADD_ARG (argv, i, NULL); ADD_ARG (argv, i, NULL);
Index: libguestfs-1.26.9/customize/customize_run.ml
===================================================================
--- libguestfs-1.26.9.orig/customize/customize_run.ml
+++ libguestfs-1.26.9/customize/customize_run.ml
@@ -105,8 +105,7 @@ exec >>%s 2>&1
| "yum" ->
sprintf "yum -y install %s" quoted_args
| "zypper" ->
- (* XXX Should we use -n option? *)
- sprintf "zypper in %s" quoted_args
+ sprintf "zypper -n in %s" quoted_args
| "unknown" ->
eprintf (f_"%s: --install is not supported for this guest operating system\n")
prog;

23
5f663c20-zypper-non-interactive.patch
View File

@ -1,23 +0,0 @@
From 5f663c2082446f2b9722c3cb0fcac6c5778978e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cbosdonnat@suse.com>
Date: Tue, 3 Feb 2015 14:38:02 +0000
Subject: [PATCH] customize: Invoke zypper correctly.
---
customize/customize_run.ml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
Index: libguestfs-1.26.9/customize/customize_run.ml
===================================================================
--- libguestfs-1.26.9.orig/customize/customize_run.ml
+++ libguestfs-1.26.9/customize/customize_run.ml
@@ -105,8 +105,7 @@ exec >>%s 2>&1
| "yum" ->
sprintf "yum -y install %s" quoted_args
| "zypper" ->
- (* XXX Should we use -n option? *)
- sprintf "zypper in %s" quoted_args
+ sprintf "zypper -n in %s" quoted_args
| "unknown" ->
eprintf (f_"%s: --install is not supported for this guest operating system\n")
prog;

2
libguestfs.changes
View File

@ -2,7 +2,7 @@
Fri Feb 6 13:45:22 UTC 2015 - cbosdonnat@suse.com Fri Feb 6 13:45:22 UTC 2015 - cbosdonnat@suse.com
- Make zypper called with -n parameter when installing packages. - Make zypper called with -n parameter when installing packages.
5f663c20-zypper-non-interactive.patch (bsc#916567) (bsc#916567)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Dec 9 15:44:39 UTC 2014 - ohering@suse.de Tue Dec 9 15:44:39 UTC 2014 - ohering@suse.de

3
libguestfs.spec
View File

@ -176,8 +176,6 @@ Summary: Compatibility package for guestfs-tools
License: GPL-2.0 License: GPL-2.0
Group: System/Filesystems Group: System/Filesystems
Patch0: 0000-hotfix.patch Patch0: 0000-hotfix.patch
# Upstream patch
Patch1: 5f663c20-zypper-non-interactive.patch
Patch1000: 1000-force-virtio_blk-in-old-guest-kernel.patch Patch1000: 1000-force-virtio_blk-in-old-guest-kernel.patch
Source0: %{name}-%{version}.tar.xz Source0: %{name}-%{version}.tar.xz
Source42: libguestfs.mkinitrd.tar.bz2 Source42: libguestfs.mkinitrd.tar.bz2
@ -514,7 +512,6 @@ virtual machines.
: _ignore_exclusive_arch '%{?_ignore_exclusive_arch}' : _ignore_exclusive_arch '%{?_ignore_exclusive_arch}'
%setup -q -a 789653 -a 42 %setup -q -a 789653 -a 42
%patch0 -p1 %patch0 -p1
%patch1 -p1
%patch1000 -p1 %patch1000 -p1
%build %build