diff -Nru libguestfs-1.40.2/debian/changelog libguestfs-1.40.2/debian/changelog --- libguestfs-1.40.2/debian/changelog 2019-02-11 12:20:44.000000000 +0000 +++ libguestfs-1.40.2/debian/changelog 2019-05-15 18:50:04.000000000 +0100 @@ -1,3 +1,10 @@ +libguestfs (1:1.40.2-1ubuntu1.1) disco; urgency=medium + + * d/p/appliance-remove-dhcp-resolved-hook.patch: remove + /etc/dhcp/dhclient-enter-hooks.d/resolved (LP: #1824236) + + -- Ioanna Alifieraki Wed, 15 May 2019 17:50:04 +0000 + libguestfs (1:1.40.2-1ubuntu1) disco; urgency=low * Merge from Debian unstable. Remaining changes: diff -Nru libguestfs-1.40.2/debian/patches/appliance-remove-dhcp-resolved-hook.patch libguestfs-1.40.2/debian/patches/appliance-remove-dhcp-resolved-hook.patch --- libguestfs-1.40.2/debian/patches/appliance-remove-dhcp-resolved-hook.patch 1970-01-01 01:00:00.000000000 +0100 +++ libguestfs-1.40.2/debian/patches/appliance-remove-dhcp-resolved-hook.patch 2019-05-15 18:49:32.000000000 +0100 @@ -0,0 +1,24 @@ +Description: appliance - Remove /etc/dhcp/dhclient-enter-hooks.d/resolved +Workaround for Ubuntu which uses this script to try to start a systemd +service. That won't work because systemd is not used inside the +appliance. +Author: Richard W.M. Jones +Bug-Ubuntu: https://launchpad.net/bugs/1824236 +Last-Update: 2019-05-15 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: libguestfs-1.40.2/appliance/init +=================================================================== +--- libguestfs-1.40.2.orig/appliance/init ++++ libguestfs-1.40.2/appliance/init +@@ -122,7 +122,9 @@ ip link set dev lo up + + if test "$guestfs_network" = 1; then + iface=$(ls -I all -I default -I lo /proc/sys/net/ipv4/conf) +- touch /etc/fstab # Workaround for Ubuntu. ++ # Two workarounds for Ubuntu: ++ touch /etc/fstab ++ rm -f /etc/dhcp/dhclient-enter-hooks.d/resolved + if dhclient --version >/dev/null 2>&1; then + dhclient $iface + else diff -Nru libguestfs-1.40.2/debian/patches/series libguestfs-1.40.2/debian/patches/series --- libguestfs-1.40.2/debian/patches/series 2019-02-11 04:16:27.000000000 +0000 +++ libguestfs-1.40.2/debian/patches/series 2019-05-15 18:49:23.000000000 +0100 @@ -12,3 +12,4 @@ 0012-Disable-v2v-test-harness.patch 0013-Fix-up-perl-path-in-installed-scripts.patch 0014-Fix-.depend-generation-for-out-of-tree-build.patch +appliance-remove-dhcp-resolved-hook.patch