Attachment 838415 Details for Bug 1044585 – 0001-appliance-Create-an-etc-resolv.conf-file-referring-t.patch

[patch] 0001-appliance-Create-an-etc-resolv.conf-file-referring-t.patch

0001-appliance-Create-an-etc-resolv.conf-file-referring-t.patch (text/plain), 1.92 KB, created by Richard W.M. Jones on 2013-12-18 16:06:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Richard W.M. Jones

Created: 2013-12-18 16:06:55 UTC

Size: 1.92 KB

patch

obsolete

>From 1fcea09ee2e89d2e727e39df80dc595f5d0ba363 Mon Sep 17 00:00:00 2001
>From: "Richard W.M. Jones" <rjones@redhat.com>
>Date: Wed, 18 Dec 2013 16:03:43 +0000
>Subject: [PATCH] appliance: Create an /etc/resolv.conf file referring to qemu
> user network nameserver (RHBZ#1044585).
>
>---
> appliance/init       | 2 ++
> appliance/make.sh.in | 6 ------
> src/launch.c         | 7 -------
> 3 files changed, 2 insertions(+), 13 deletions(-)
>
>diff --git a/appliance/init b/appliance/init
>index b474f31..be547e3 100755
>--- a/appliance/init
>+++ b/appliance/init
>@@ -80,6 +80,8 @@ ip link set dev eth0 up
> 
> ip route add default via 169.254.2.2
> 
>+echo nameserver 169.254.2.3 > /etc/resolv.conf
>+
> # Scan for MDs.
> mdadm -As --auto=yes --run
> 
>diff --git a/appliance/make.sh.in b/appliance/make.sh.in
>index 8ba1fa4..c4b1c64 100755
>--- a/appliance/make.sh.in
>+++ b/appliance/make.sh.in
>@@ -53,12 +53,6 @@ grep -v '^/usr/share/gnome/help/' |
> grep -v '^/usr/share/cracklib/' |
> grep -v '^/usr/share/i18n/' > supermin.d/hostfiles-t
> 
>-# XXX resolv.conf?  The old script had:
>-# echo nameserver 169.254.2.3 > resolv.conf
>-if ! grep -q /etc/resolv.conf supermin.d/hostfiles-t; then
>-    echo /etc/resolv.conf >> supermin.d/hostfiles-t
>-fi
>-
> # Include any Augeas lenses from the host.
> if grep -q /usr/share/augeas/lenses supermin.d/hostfiles-t; then
>     echo "/usr/share/augeas/lenses/*.aug" >> supermin.d/hostfiles-t
>diff --git a/src/launch.c b/src/launch.c
>index 9c1c33a..b7b5b80 100644
>--- a/src/launch.c
>+++ b/src/launch.c
>@@ -93,13 +93,6 @@ guestfs__launch (guestfs_h *g)
>   if (g->backend_ops->launch (g, g->backend_data, g->backend_arg) == -1)
>     return -1;
> 
>-  /* If network is enabled, upload /etc/resolv.conf from the host so
>-   * the guest will know how to reach the nameservers.
>-   */
>-  if (g->enable_network && access ("/etc/resolv.conf", F_OK) == 0) {
>-    guestfs_internal_upload (g, "/etc/resolv.conf", "/etc/resolv.conf", 0644);
>-  }
>-
>   return 0;
> }
> 
>-- 
>1.8.3.1
>

Actions: View | Diff

Attachments on bug 1044585: 838415