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

Proposed by Christian Ehrhardt 
Status: Merged
Approved by: Christian Ehrhardt 
Approved revision: f3179c6794685a89bb84dd980e8e9fe6c582ede5
Merged at revision: f3179c6794685a89bb84dd980e8e9fe6c582ede5
Proposed branch: ~paelzer/ubuntu/+source/libguestfs:lp-1793056-fix-internal-bin-sh
Merge into: ubuntu/+source/libguestfs:ubuntu/bionic-devel
Diff against target: 60 lines (+38/-0)
3 files modified
debian/changelog (+7/-0)
debian/patches/lp-1793056-fix-internal-bin-sh.patch (+30/-0)
debian/patches/series (+1/-0)
Reviewer Review Type Date Requested Status
Robie Basak Approve
Canonical Server Pending
git-ubuntu developers Pending
Review via email: mp+355588@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Rebased for new version

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

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

Revision history for this message
Robie Basak (racb) wrote :

+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
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Thanks for the hint, updated the SRU Template.

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

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.

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Seen in bionic-unapproved, waiting to be accepted

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 02df5bd..c464c4c 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+libguestfs (1:1.36.13-1ubuntu3.2) bionic; urgency=medium
7+
8+ * d/p/lp-1793056-fix-internal-bin-sh.patch: fix guestfish tasks that
9+ required virtual environment and missed /bin/sh (LP: #1793056)
10+
11+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Tue, 25 Sep 2018 09:52:15 +0200
12+
13 libguestfs (1:1.36.13-1ubuntu3.1) bionic; urgency=medium
14
15 * d/p/lp-1766534-s390x-*: backport s390x/CCW support from 1.37.22 to Bionic
16diff --git a/debian/patches/lp-1793056-fix-internal-bin-sh.patch b/debian/patches/lp-1793056-fix-internal-bin-sh.patch
17new file mode 100644
18index 0000000..b1bd24c
19--- /dev/null
20+++ b/debian/patches/lp-1793056-fix-internal-bin-sh.patch
21@@ -0,0 +1,30 @@
22+From e2e3248377e52314ce9ac60a9cb1fed9ec209ad4 Mon Sep 17 00:00:00 2001
23+From: Pino Toscano <ptoscano@redhat.com>
24+Date: Mon, 19 Feb 2018 14:46:32 +0100
25+Subject: [PATCH] appliance: include dash for Debian distros
26+
27+Make sure that /bin/sh is available in the appliance, and that path is
28+provided by dash on Debian distributions.
29+
30+(cherry picked from commit 0cca7f9061455d29a7f893e715028cd3e75c19fd)
31+
32+Author: Christian Ehrhardt <christian.ehrhardt@canonical.com>
33+Original-Author: Pino Toscano <ptoscano@redhat.com>
34+Origin: backport, https://github.com/libguestfs/libguestfs/commit/e2e3248377e52314ce9ac60a9cb1fed9ec209ad4
35+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1793056
36+Last-Update: 2018-09-25
37+
38+---
39+ appliance/packagelist.in | 1 +
40+ 1 file changed, 1 insertion(+)
41+
42+--- a/appliance/packagelist.in
43++++ b/appliance/packagelist.in
44+@@ -60,6 +60,7 @@ ifelse(DEBIAN,1,
45+ dnl old name used in Jessie and earlier
46+ btrfs-tools
47+ cryptsetup
48++ dash
49+ extlinux
50+ fdisk
51+ genisoimage
52diff --git a/debian/patches/series b/debian/patches/series
53index ab5fdde..99f8149 100644
54--- a/debian/patches/series
55+++ b/debian/patches/series
56@@ -15,3 +15,4 @@ lp-1766534-s390x-4-6-launch-direct-Use-virtio-ccw-on-this-architect.patch
57 lp-1766534-s390x-5-6-tests-regressions-Skip-IDE-tests-on-S-390.patch
58 lp-1766534-s390x-6-6-lib-Add-VIRTIO_DEVICE_NAME-macro-to-handle-virtio-mm.patch
59 lp-1782138-java-support-OpenJDK-10.patch
60+lp-1793056-fix-internal-bin-sh.patch

Subscribers

People subscribed via source and target branches