From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relay1.mentorg.com (relay1.mentorg.com [192.94.38.131]) by mail.openembedded.org (Postfix) with ESMTP id 971F07649E for ; Thu, 30 Jul 2015 16:58:10 +0000 (UTC) Received: from svr-orw-fem-05.mgc.mentorg.com ([147.34.97.43]) by relay1.mentorg.com with esmtp id 1ZKr9l-0005We-UW from Joe_MacDonald@mentor.com ; Thu, 30 Jul 2015 09:58:09 -0700 Received: from burninator (147.34.91.1) by svr-orw-fem-05.mgc.mentorg.com (147.34.97.43) with Microsoft SMTP Server id 14.3.224.2; Thu, 30 Jul 2015 09:58:08 -0700 Received: by burninator (Postfix, from userid 1000) id 623D058162E; Thu, 30 Jul 2015 12:57:34 -0400 (EDT) Date: Thu, 30 Jul 2015 12:57:34 -0400 From: Joe MacDonald To: Message-ID: <20150730165734.GD6457@mentor.com> References: <1438050989-15233-1-git-send-email-rongqing.li@windriver.com> MIME-Version: 1.0 In-Reply-To: <1438050989-15233-1-git-send-email-rongqing.li@windriver.com> X-URL: http://github.com/joeythesaint/joe-s-common-environment/tree/master X-Configuration: git://github.com/joeythesaint/joe-s-common-environment.git X-Editor: Vim-704 http://www.vim.org User-Agent: Mutt/1.5.23 (2014-03-12) Cc: openembedded-devel@lists.openembedded.org Subject: Re: [PATCH 1/2] ypbind-mt: get parameters from dhcp X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Jul 2015 16:58:10 -0000 X-Groupsio-MsgNum: 56442 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="Q0rSlbzrZN6k9QnT" Content-Disposition: inline --Q0rSlbzrZN6k9QnT Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable [[oe] [PATCH 1/2] ypbind-mt: get parameters from dhcp] On 15.07.28 (Tue 10:= 36) rongqing.li@windriver.com wrote: > From: Li Wang >=20 > adopt a script nis.sh from > https://git.centos.org/raw/rpms!ypbind.git/5a592e88374f067679276488430ebd= f51152c358/SOURCES!nis.sh > it is dhclient-script plugin for NIS settings. >=20 > Signed-off-by: Li Wang > Signed-off-by: Roy Li > --- > .../recipes-support/nis/ypbind-mt/nis.sh | 108 +++++++++++++++= ++++++ > .../recipes-support/nis/ypbind-mt_1.38.bb | 4 + > .../recipes-support/nis/ypbind-mt_2.2.bb | 4 + > 3 files changed, 116 insertions(+) > create mode 100755 meta-networking/recipes-support/nis/ypbind-mt/nis.sh >=20 > diff --git a/meta-networking/recipes-support/nis/ypbind-mt/nis.sh b/meta-= networking/recipes-support/nis/ypbind-mt/nis.sh > new file mode 100755 > index 0000000..a1e338c > --- /dev/null > +++ b/meta-networking/recipes-support/nis/ypbind-mt/nis.sh > @@ -0,0 +1,108 @@ > +#!/bin/sh > +# > +# nis.sh: dhclient-script plugin for NIS settings, > +# place in /etc/dhcp/dhclient.d and 'chmod +x nis.sh' to enable > +# > +# Copyright (C) 2008 Red Hat, Inc. > +# > +# This program is free software; you can redistribute it and/or modify > +# it under the terms of the GNU General Public License as published by > +# the Free Software Foundation; either version 2 of the License, or > +# (at your option) any later version. > +# > +# This program is distributed in the hope that it will be useful, > +# but WITHOUT ANY WARRANTY; without even the implied warranty of > +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > +# GNU General Public License for more details. > +# > +# You should have received a copy of the GNU General Public License > +# along with this program. If not, see . > +# > +# Author(s): David Cantrell > + > +CONF=3D/etc/yp.conf This should probably be substituted with @SYSCONFDIR@ so it's still functional for anyone who changes ${sysconfdir}. Just thinking out loud now, but what's the systemd equivalent here? Do we already have one? That's not a barrier to accepting this patch, either way. I'd just like to see this hard-coded path be slightly less hard-coded. -J. > +SAVECONF=3D${SAVEDIR}/${CONF##*/}.predhclient.${interface} > + > +fix_context() { > + if [ -x /sbin/restorecon ]; then > + /sbin/restorecon ${1} >/dev/null 2>&1 > + fi > +} > + > +save_config_file() { > + if [ ! -d ${SAVEDIR} ]; then > + mkdir -p ${SAVEDIR} > + fi > + > + if [ -e ${CONF} ]; then > + # cp+rm instead of mv: preserve SELinux context > + # rhbz#509240 > + # Do not rely on restorecon. > + cp -c ${CONF} ${SAVECONF} > + rm ${CONF} > + else > + echo > ${SAVECONF} > + # Try restorecon > + fix_context ${SAVECONF} > + fi > +} > + > +nis_config() { > + if [ ! "${PEERNIS}" =3D "no" ]; then > + if [ -n "${new_nis_domain}" ]; then > + domainname "${new_nis_domain}" > + save_config_file > + let contents=3D0 > + echo '# generated by /sbin/dhclient-script' > ${CONF} > + fix_context ${CONF} > + > + if [ -n "${new_nis_servers}" ]; then > + for i in ${new_nis_servers} ; do > + echo "domain ${new_nis_domain} server ${i}" >> ${CON= F} > + let contents=3Dcontents+1 > + done > + else > + echo "domain ${new_nis_domain} broadcast" >> ${CONF} > + let contents=3Dcontents+1 > + fi > + > + if [ ${contents} -gt 0 ]; then > + service ypbind condrestart >/dev/null 2>&1 > + fi > + elif [ -n "${new_nis_servers}" ]; then > + save_config_file > + echo '# generated by /sbin/dhclient-script' > ${CONF} > + fix_context ${CONF} > + let contents=3D0 > + > + for i in ${new_nis_servers} ; do > + echo "ypserver ${i}" >> ${CONF} > + let contents=3Dcontents+1 > + done > + > + if [ $contents -gt 0 ]; then > + service ypbind condrestart >/dev/null 2>&1 > + fi > + fi > + fi > +} > + > +nis_restore() { > + if [ ! "${PEERNIS}" =3D "no" ]; then > + if [ -f ${SAVECONF} ]; then > + rm -f ${CONF} > + # cp+rm instead of mv: preserve SELinux context > + # rhbz#509240 > + cp -c ${SAVECONF} ${CONF} > + rm ${SAVECONF} > + fix_context ${CONF} # Restorecon again to be sure. > + service ypbind condrestart >/dev/null 2>&1 > + fi > + fi > +} > + > +# Local Variables: > +# indent-tabs-mode: nil > +# sh-basic-offset: 4 > +# show-trailing-whitespace: t > +# End: > diff --git a/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb b/meta= -networking/recipes-support/nis/ypbind-mt_1.38.bb > index d25ef5c..5391b5b 100644 > --- a/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb > +++ b/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb > @@ -28,6 +28,7 @@ PROVIDES +=3D "ypbind" > SRC_URI =3D "http://www.linux-nis.org/download/ypbind-mt/${BP}.tar.bz2 \ > file://ypbind-yocto.init \ > file://ypbind.service \ > + file://nis.sh \ > " > SRC_URI[md5sum] =3D "094088c0e282fa7f3b3dd6cc51d0a4e1" > SRC_URI[sha256sum] =3D "1930ce19f6ccfe10400f3497b31867f71690d2bcd3f5b575= 199fa915559b7746" > @@ -48,6 +49,9 @@ do_install_append () { > =20 > install -d ${D}${systemd_unitdir}/system > install -m 0644 ${WORKDIR}/ypbind.service ${D}${systemd_unitdir}/sys= tem > + > + install -d ${D}/${sysconfdir}/dhcp/dhclient.d > + install -m 755 ${WORKDIR}/nis.sh ${D}/${sysconfdir}/dhcp/dhclient.d/ > } > =20 > =20 > diff --git a/meta-networking/recipes-support/nis/ypbind-mt_2.2.bb b/meta-= networking/recipes-support/nis/ypbind-mt_2.2.bb > index 4f8bf48..6d5ab2d 100644 > --- a/meta-networking/recipes-support/nis/ypbind-mt_2.2.bb > +++ b/meta-networking/recipes-support/nis/ypbind-mt_2.2.bb > @@ -23,6 +23,7 @@ PNBLACKLIST[ypbind-mt] ?=3D "BROKEN: Depends on broken = yp-tools" > SRC_URI =3D "http://www.linux-nis.org/download/ypbind-mt/${BP}.tar.bz2 \ > file://ypbind-yocto.init \ > file://ypbind.service \ > + file://nis.sh \ > " > SRC_URI[md5sum] =3D "54e2040d8266ae7d302d081ca310c8a8" > SRC_URI[sha256sum] =3D "dc2f7d97c94dcab0acfdcd115cd8b464eb8c427e4bb0fe68= 404ae7465f517cd3" > @@ -45,6 +46,9 @@ do_install_append () { > =20 > install -d ${D}${systemd_unitdir}/system > install -m 0644 ${WORKDIR}/ypbind.service ${D}${systemd_unitdir}/sys= tem > + > + install -d ${D}/${sysconfdir}/dhcp/dhclient.d > + install -m 755 ${WORKDIR}/nis.sh ${D}/${sysconfdir}/dhcp/dhclient.d/ > } > =20 > =20 > --=20 > 2.1.4 >=20 --=20 -Joe MacDonald. :wq --Q0rSlbzrZN6k9QnT Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAEBAgAGBQJVuld+AAoJEEn8ffcsOfaWeToH/1O66VYoXaH/QClaQbnB2g62 GTMDvez453IfVgo8z/p29RpKG+GjjB4e5hexqePAiCzzof5KUOkquSsJy3jQ9lz9 YTBDYFtWDPJzcHPl/2O4zUvMUGkZApOo+oG1ErHOEaqhI6WHcfsreGXKUklpaBgl YaDHjDszp0LCkbjkyZ8Bi2CSdFQLlyobu6KabmUBbzqhGRKhHdJ9y/88EnTTjbbl 6GThFo44Eq6yfDaribmIDHAD3ZbK3lTYG/uuDeBj69ZTI+vwVngCFLizLQu6qiOK b12pydIVAal0vcHfY84yAc23rxhCOkJCLUlS75824npibX9J+LD8RJPnkB0+6o8= =Afhz -----END PGP SIGNATURE----- --Q0rSlbzrZN6k9QnT--