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

Accepting request 335951 from Virtualization

Browse Source 
- Add password default encryption method for sles. fate#318952

- Add -l to zypper for install and update.

OBS-URL: https://build.opensuse.org/request/show/335951
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libguestfs?expand=0&rev=36
This commit is contained in:
Dominique Leuenberger 2015-10-06 11:25:58 +00:00 committed by Git OBS Bridge
commit af84b33c4a
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
0000-hotfix.patch
View File

@ -42,10 +42,19 @@ Index: libguestfs-1.26.10/customize/customize_run.ml
| "zypper" -> | "zypper" ->
- (* XXX Should we use -n option? *) - (* XXX Should we use -n option? *)
- sprintf "zypper in %s" quoted_args - sprintf "zypper in %s" quoted_args
+ sprintf "zypper -n in %s" quoted_args + sprintf "zypper -n in -l %s" quoted_args
| "unknown" -> | "unknown" ->
eprintf (f_"%s: --install is not supported for this guest operating system\n") eprintf (f_"%s: --install is not supported for this guest operating system\n")
prog; 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 Index: libguestfs-1.26.10/builder/downloader.ml
=================================================================== ===================================================================
--- libguestfs-1.26.10.orig/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", v when v >= 10 -> `SHA512
| "ubuntu", _ -> `MD5 | "ubuntu", _ -> `MD5
+ | "opensuse", v when v >= 11 -> `SHA512 + | ("opensuse"|"sles"), v when v >= 11 -> `SHA512
+ | "opensuse", _ -> `MD5 + | ("opensuse"|"sles"), _ -> `MD5
+ +
| _, _ -> | _, _ ->
warning ~prog (f_"password: using insecure md5 password encryption for warning ~prog (f_"password: using insecure md5 password encryption for

10
libguestfs.changes
View File

@ -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 Mon Sep 14 11:27:19 UTC 2015 - cbosdonnat@suse.com