2014-08-26 09:25:04 +02:00
|
|
|
From c977e24dec46803fe691f5da35756523e6356473 Mon Sep 17 00:00:00 2001
|
2014-03-28 15:19:16 +01:00
|
|
|
From: Olaf Hering <olaf@aepfle.de>
|
2014-05-13 15:41:42 +02:00
|
|
|
Date: Tue, 13 May 2014 15:31:21 +0200
|
|
|
|
Subject: hotfix
|
2014-03-28 15:19:16 +01:00
|
|
|
|
|
|
|
Signed-off-by: Olaf Hering <olaf@aepfle.de>
|
|
|
|
---
|
2014-05-13 15:51:49 +02:00
|
|
|
pkg-hotfix.txt | 1 +
|
|
|
|
1 file changed, 1 insertion(+)
|
2014-05-13 15:41:42 +02:00
|
|
|
create mode 100644 pkg-hotfix.txt
|
2014-03-28 15:19:16 +01:00
|
|
|
|
2014-05-13 15:41:42 +02:00
|
|
|
diff --git a/pkg-hotfix.txt b/pkg-hotfix.txt
|
|
|
|
new file mode 100644
|
2014-05-13 15:51:49 +02:00
|
|
|
index 0000000..8b13789
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/pkg-hotfix.txt
|
|
|
|
@@ -0,0 +1 @@
|
|
|
|
+
|
2014-10-16 13:27:06 +02:00
|
|
|
diff --git a/daemon/btrfs.c b/daemon/btrfs.c
|
|
|
|
index 7a4d43d..ceea593 100644
|
|
|
|
--- a/daemon/btrfs.c
|
|
|
|
+++ b/daemon/btrfs.c
|
|
|
|
@@ -356,6 +356,7 @@ do_btrfs_subvolume_list (const mountable_t *fs)
|
|
|
|
ADD_ARG (argv, i, str_btrfs);
|
|
|
|
ADD_ARG (argv, i, "subvolume");
|
|
|
|
ADD_ARG (argv, i, "list");
|
2014-10-16 17:06:01 +02:00
|
|
|
+ ADD_ARG (argv, i, "-o");
|
2014-10-16 13:27:06 +02:00
|
|
|
ADD_ARG (argv, i, fs_buf);
|
|
|
|
ADD_ARG (argv, i, NULL);
|
|
|
|
|
2015-02-06 16:27:36 +01:00
|
|
|
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;
|