diff --git a/0000-hotfix.patch b/0000-hotfix.patch index c41441c..839636c 100644 --- a/0000-hotfix.patch +++ b/0000-hotfix.patch @@ -42,10 +42,19 @@ Index: libguestfs-1.26.10/customize/customize_run.ml | "zypper" -> - (* XXX Should we use -n option? *) - sprintf "zypper in %s" quoted_args -+ sprintf "zypper -n in %s" quoted_args ++ sprintf "zypper -n in -l %s" quoted_args | "unknown" -> eprintf (f_"%s: --install is not supported for this guest operating system\n") prog; +@@ -135,7 +136,7 @@ exec >>%s 2>&1 + | "yum" -> + sprintf "yum -y update" + | "zypper" -> +- sprintf "zypper update" ++ sprintf "zypper -n update -l" + | "unknown" -> + eprintf (f_"%s: --update is not supported for this guest operating system\n") + prog; Index: libguestfs-1.26.10/builder/downloader.ml =================================================================== --- libguestfs-1.26.10.orig/builder/downloader.ml @@ -148,8 +157,8 @@ Index: libguestfs-1.26.10/customize/password.ml | "ubuntu", v when v >= 10 -> `SHA512 | "ubuntu", _ -> `MD5 -+ | "opensuse", v when v >= 11 -> `SHA512 -+ | "opensuse", _ -> `MD5 ++ | ("opensuse"|"sles"), v when v >= 11 -> `SHA512 ++ | ("opensuse"|"sles"), _ -> `MD5 + | _, _ -> warning ~prog (f_"password: using insecure md5 password encryption for diff --git a/libguestfs.changes b/libguestfs.changes index a66702c..8ea0b8e 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Oct 1 12:09:22 UTC 2015 - cbosdonnat@suse.com + +- Add password default encryption method for sles. fate#318952 + +------------------------------------------------------------------- +Tue Sep 29 14:21:52 UTC 2015 - cbosdonnat@suse.com + +- Add -l to zypper for install and update. + ------------------------------------------------------------------- Mon Sep 14 11:27:19 UTC 2015 - cbosdonnat@suse.com