On Mon, Sep 17, 2012 at 10:29:30AM +0200, Christoph Fritz wrote: > > Signed-off-by: Christoph Fritz <[email protected]>
Applied. Michael > --- > v2: > -change PTXCONF_ROOTFS_RESOLV to > PTXCONF_ROOTFS_RESOLV_FILE in rootfs.make too > --- > rules/rootfs.in | 27 ++++++++++++++++++++++----- > rules/rootfs.make | 5 ++++- > 2 files changed, 26 insertions(+), 6 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..c60b840 100644 > --- a/rules/rootfs.make > +++ b/rules/rootfs.make > @@ -215,7 +215,7 @@ endif > ifdef PTXCONF_ROOTFS_PROTOCOLS > @$(call install_alternative, rootfs, 0, 0, 0644, /etc/protocols) > endif > -ifdef PTXCONF_ROOTFS_RESOLV > +ifdef PTXCONF_ROOTFS_RESOLV_FILE > @$(call install_alternative, rootfs, 0, 0, 0644, /etc/resolv.conf) > # # replace either by PTXCONF_BOARDSETUP_GATEWAY or nothing if not defined > ifneq ($(PTXCONF_BOARDSETUP_GATEWAY),) > @@ -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 > ifdef PTXCONF_ROOTFS_SERVICES > @$(call install_alternative, rootfs, 0, 0, 0644, /etc/services) > endif > -- > 1.7.2.5 > > > > > -- > ptxdist mailing list > [email protected] > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -- ptxdist mailing list [email protected]
