Merge ~paelzer/ubuntu/+source/libguestfs:lp-1793056-fix-internal-bin-sh into ubuntu/+source/libguestfs:ubuntu/bionic-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

Test PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3439

[Christian Ehrhardt  (paelzer)]

Rebased for new version

[Christian Ehrhardt  (paelzer)]

Tested from PPA and also generally working fine in a sniff test.
Opening up for Team review.

[Robie Basak (racb)]

+1, but before upload please adjust the SRU description for Impact. "fails to run almost any internal commands" -> why is this a problem for the user? Does it mean that the program doesn't work at all? Does it mean that some function doesn't work? Or does it happen to work anyway, in which case we wouldn't SRU?

review: Approve

[Christian Ehrhardt  (paelzer)]

Thanks for the hint, updated the SRU Template.

[Christian Ehrhardt  (paelzer)]

Tag pushed
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/libguestfs
 * [new tag] upload/1%1.36.13-1ubuntu3.2 -> upload/1%1.36.13-1ubuntu3.2

And uploaded:
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading libguestfs_1.36.13-1ubuntu3.2.dsc: done.
  Uploading libguestfs_1.36.13-1ubuntu3.2.debian.tar.xz: done.
  Uploading libguestfs_1.36.13-1ubuntu3.2_source.buildinfo: done.
  Uploading libguestfs_1.36.13-1ubuntu3.2_source.changes: done.
Successfully uploaded packages.

[Christian Ehrhardt  (paelzer)]

Seen in bionic-unapproved, waiting to be accepted

diff --git a/debian/changelog b/debian/changelog
index 02df5bd..c464c4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libguestfs (1:1.36.13-1ubuntu3.2) bionic; urgency=medium
+
+  * d/p/lp-1793056-fix-internal-bin-sh.patch: fix guestfish tasks that
+    required virtual environment and missed /bin/sh (LP: #1793056)
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 25 Sep 2018 09:52:15 +0200
+
 libguestfs (1:1.36.13-1ubuntu3.1) bionic; urgency=medium
 
   * d/p/lp-1766534-s390x-*: backport s390x/CCW support from 1.37.22 to Bionic
diff --git a/debian/patches/lp-1793056-fix-internal-bin-sh.patch b/debian/patches/lp-1793056-fix-internal-bin-sh.patch
new file mode 100644
index 0000000..b1bd24c
--- /dev/null
+++ b/debian/patches/lp-1793056-fix-internal-bin-sh.patch
@@ -0,0 +1,30 @@
+From e2e3248377e52314ce9ac60a9cb1fed9ec209ad4 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <[e-mail]>
+Date: Mon, 19 Feb 2018 14:46:32 +0100
+Subject: [PATCH] appliance: include dash for Debian distros
+
+Make sure that /bin/sh is available in the appliance, and that path is
+provided by dash on Debian distributions.
+
+(cherry picked from commit 0cca7f9061455d29a7f893e715028cd3e75c19fd)
+
+Author: Christian Ehrhardt <[e-mail]>
+Original-Author: Pino Toscano <[e-mail]>
+Origin: backport, https://github.com/libguestfs/libguestfs/commit/e2e3248377e52314ce9ac60a9cb1fed9ec209ad4
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1793056
+Last-Update: 2018-09-25
+
+---
+ appliance/packagelist.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/appliance/packagelist.in
++++ b/appliance/packagelist.in
+@@ -60,6 +60,7 @@ ifelse(DEBIAN,1,
+ dnl old name used in Jessie and earlier
+   btrfs-tools
+   cryptsetup
++  dash
+   extlinux
+   fdisk
+   genisoimage
diff --git a/debian/patches/series b/debian/patches/series
index ab5fdde..99f8149 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@ lp-1766534-s390x-4-6-launch-direct-Use-virtio-ccw-on-this-architect.patch
 lp-1766534-s390x-5-6-tests-regressions-Skip-IDE-tests-on-S-390.patch
 lp-1766534-s390x-6-6-lib-Add-VIRTIO_DEVICE_NAME-macro-to-handle-virtio-mm.patch
 lp-1782138-java-support-OpenJDK-10.patch
+lp-1793056-fix-internal-bin-sh.patch