[ptxdist] Antwort: [PATCH] rootfs: add choice to link resolv.conf to /proc/net/pnp

[Jan Weitzel <J.Weitzel@phytec.de>]

Mit freundlichen Grüßen

Dipl. Ing. (FH) Jan Weitzel

-Software Entwicklung-
PHYTEC Messtechnik GmbH
Robert-Koch-Str. 39
55129 Mainz
Tel.: +49 (0)6131 9221-0
Web: http://www.phytec.de

Geschäftsführer: Dipl.-Ing. Michael Mitezki, Handelsregister Mainz, HRB 
4656, Finanzamt Mainz-Mitte, St.Nr. 266500608, DE 149059855
This E-Mail may contain confidential or privileged information. If you are 
not the intended recipient (or have received this E-Mail in error) please 
notify the sender immediately and destroy this E-Mail. Any unauthorized 
copying, disclosure or distribution of the material in this E-Mail is 
strictly forbidden.

Christoph Fritz <chf.fritz@googlemail.com> wrote on 14.09.2012 17:08:46:

> Von: Christoph Fritz <chf.fritz@googlemail.com>
> An: Michael Olbrich <m.olbrich@pengutronix.de>, 
> Kopie: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>, 
> ptxdist@pengutronix.de
> Datum: 14.09.2012 17:08
> Betreff: [PATCH] rootfs: add choice to link resolv.conf to /proc/net/pnp
> 
> 
> Signed-off-by: Christoph Fritz <chf.fritz@googlemail.com>
> ---
>  rules/rootfs.in   |   27 ++++++++++++++++++++++-----
>  rules/rootfs.make |    3 +++
>  2 files changed, 25 insertions(+), 5 deletions(-)
> 
> diff --git a/rules/rootfs.in b/rules/rootfs.in
> index 350f0c2..3c3765d 100644
> --- a/rules/rootfs.in
> +++ b/rules/rootfs.in
> @@ -390,12 +390,29 @@ config ROOTFS_PROTOCOLS
>       If enabled, it installs the "./projectroot/etc/protocols" file if
>       present, else a generic one from the ptxdist directory.
> 
> -config ROOTFS_RESOLV
> -   bool
> +choice
>     prompt "install /etc/resolv.conf"
> -   help
> -     If enabled, it installs the "./projectroot/etc/resolv.conf" file 
if
> -     present, else a generic one from the ptxdist directory.
> +   default ROOTFS_RESOLV_FILE
> +
> +   config ROOTFS_RESOLV_FILE
> +      bool
> +      prompt "as generic"
> +      help
> +        If enabled, it installs the "./projectroot/etc/resolv.conf" 
file if
> +        present, else a generic one from the ptxdist directory.
> +
> +   config ROOTFS_RESOLV_LINK
> +      bool
> +      prompt "as link"
> +      help
> +        If enabled, it installs /etc/resolv.conf as a link to 
/proc/net/pnp.
> +
> +   config ROOTFS_RESOLV_NONE
> +      bool
> +      prompt "not"
> +      help
> +        If enabled, no /etc/resolv.conf will be install.
> +endchoice
> 
>  config ROOTFS_SERVICES
>     bool
> diff --git a/rules/rootfs.make b/rules/rootfs.make
> index 8306c53..4e3c7b0 100644
> --- a/rules/rootfs.make
> +++ b/rules/rootfs.make
> @@ -226,6 +226,9 @@ else
>     @$(call install_replace, rootfs, /etc/resolv.conf, 
@NAMESERVER_LINE@, "")
>  endif
>  endif
> +ifdef PTXCONF_ROOTFS_RESOLV_LINK
> +   @$(call install_link, rootfs, /proc/net/pnp, /etc/resolv.conf)
> +endif
Sollte hier nicht auch ROOTFS_RESOLV_FILE auftauchen?
Jan
>  ifdef PTXCONF_ROOTFS_SERVICES
>     @$(call install_alternative, rootfs, 0, 0, 0644, /etc/services)
>  endif
> -- 
> 1.7.2.5
> 
> 
> 


-- 
ptxdist mailing list
ptxdist@pengutronix.de