Libguestfs - Apr 2019 - [PATCH] 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.  See:

https://bugs.launchpad.net/ubuntu/+source/supermin/+bug/1824236

Thanks: Ioanna Alifieraki
---
 appliance/init | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/appliance/init b/appliance/init
index 4f2b55822..b1c4d09ea 100755
--- a/appliance/init
+++ b/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
-- 
2.20.1

On Thursday, 18 April 2019 11:53:39 CEST Richard W.M. Jones
wrote:
> 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.  See:
> 
> https://bugs.launchpad.net/ubuntu/+source/supermin/+bug/1824236
> 
> Thanks: Ioanna Alifieraki
> ---
>  appliance/init | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/appliance/init b/appliance/init
> index 4f2b55822..b1c4d09ea 100755
> --- a/appliance/init
> +++ b/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
Why not add it as excludefile when building the supermin appliance,
instead?  This way, Ubuntu would not even need to do any changes in
libguestfs itself, and that excludefile can be shipped by the same
package installing that dhclient hook.

-- 
Pino Toscano

I had tried this approach, to add /etc/dhcp/dhclient-enter-hooks.d/resolved
to excludefiles, however it didn't work.
As far as I know, this hook is included in the base image and according
to [1], the current implementation does not apply excludefiles to the base
image.

Jo

[1]
https://github.com/libguestfs/supermin/blob/b2401285cd3e3d42006fc164ef1f046cc35a50c4/src/mode_build.ml#L137


On Thu, Apr 18, 2019 at 10:58 AM Pino Toscano <ptoscano@redhat.com> wrote:
> On Thursday, 18 April 2019 11:53:39 CEST Richard W.M. Jones wrote:
> > 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.  See:
> >
> > https://bugs.launchpad.net/ubuntu/+source/supermin/+bug/1824236
> >
> > Thanks: Ioanna Alifieraki
> > ---
> >  appliance/init | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/appliance/init b/appliance/init
> > index 4f2b55822..b1c4d09ea 100755
> > --- a/appliance/init
> > +++ b/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
>
> Why not add it as excludefile when building the supermin appliance,
> instead?  This way, Ubuntu would not even need to do any changes in
> libguestfs itself, and that excludefile can be shipped by the same
> package installing that dhclient hook.
>
> --
> Pino Toscano_______________________________________________
> Libguestfs mailing list
> Libguestfs@redhat.com
> https://www.redhat.com/mailman/listinfo/libguestfs