diff --git a/0000-hotfix.patch b/0000-hotfix.patch index 2710ab6..bd715a5 100644 --- a/0000-hotfix.patch +++ b/0000-hotfix.patch @@ -28,13 +28,18 @@ index 7a4d43d..ceea593 100644 ADD_ARG (argv, i, fs_buf); ADD_ARG (argv, i, NULL); -Index: libguestfs-1.26.9/customize/customize_run.ml +Index: libguestfs-1.26.10/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 +--- libguestfs-1.26.10.orig/customize/customize_run.ml ++++ libguestfs-1.26.10/customize/customize_run.ml +@@ -103,10 +103,11 @@ exec >>%s 2>&1 + | "urpmi" -> + sprintf "urpmi %s" quoted_args | "yum" -> - sprintf "yum -y install %s" quoted_args +- sprintf "yum -y install %s" quoted_args ++ sprintf " ++ yum -y install %s ++ pkill gpg-agent" quoted_args | "zypper" -> - (* XXX Should we use -n option? *) - sprintf "zypper in %s" quoted_args diff --git a/libguestfs.changes b/libguestfs.changes index b778e04..fb0fd43 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jul 28 13:53:53 UTC 2015 - cbosdonnat@suse.com + +- Make sure gpg-agent isn't blocking unmount operations for + fedora 22+ images. boo#939105 + ------------------------------------------------------------------- Fri Jul 24 12:33:51 UTC 2015 - ohering@suse.de diff --git a/libguestfs.spec b/libguestfs.spec index 6f48347..49e9f7a 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -1,7 +1,7 @@ # # spec file for package libguestfs # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2011 Michal Hrusecky # # All modifications and additions to the file contributed by third parties