From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail1.windriver.com (mail1.windriver.com [147.11.146.13]) by mail.openembedded.org (Postfix) with ESMTP id 74BD76AE37 for ; Fri, 8 Nov 2013 08:30:39 +0000 (UTC) Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail1.windriver.com (8.14.5/8.14.3) with ESMTP id rA88Uf55004634 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=FAIL) for ; Fri, 8 Nov 2013 00:30:41 -0800 (PST) Received: from [128.224.162.194] (128.224.162.194) by ALA-HCA.corp.ad.wrs.com (147.11.189.40) with Microsoft SMTP Server id 14.2.347.0; Fri, 8 Nov 2013 00:30:41 -0800 Message-ID: <527CA127.8030202@windriver.com> Date: Fri, 8 Nov 2013 16:30:31 +0800 From: Hongxu Jia User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.1.0 MIME-Version: 1.0 To: Rongqing Li , References: <568c0cba0af47d5f6a0402ef4ac8316db7769326.1383884700.git.hongxu.jia@windriver.com> <527C71BF.3020002@windriver.com> In-Reply-To: <527C71BF.3020002@windriver.com> Subject: Re: [PATCH 1/1] quagga: add pam support for vtysh 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: Fri, 08 Nov 2013 08:30:39 -0000 Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit On 11/08/2013 01:08 PM, Rongqing Li wrote: > > > On 11/08/2013 12:32 PM, Hongxu Jia wrote: >> According to DISTRO_FEATURES to add pam support for quagga, and import >> configure file from Fedora. >> >> Signed-off-by: Hongxu Jia >> --- >> meta-networking/recipes-protocols/quagga/files/quagga.pam | 13 >> +++++++++++++ >> meta-networking/recipes-protocols/quagga/quagga.inc | 13 >> ++++++++++++- >> 2 files changed, 25 insertions(+), 1 deletion(-) >> create mode 100644 >> meta-networking/recipes-protocols/quagga/files/quagga.pam >> >> diff --git >> a/meta-networking/recipes-protocols/quagga/files/quagga.pam >> b/meta-networking/recipes-protocols/quagga/files/quagga.pam >> new file mode 100644 >> index 0000000..3541a97 >> --- /dev/null >> +++ b/meta-networking/recipes-protocols/quagga/files/quagga.pam >> @@ -0,0 +1,13 @@ >> +# >> +# The PAM configuration file for the quagga `vtysh' service >> +# >> + >> +# This allows root to change user infomation without being >> +# prompted for a password >> +auth sufficient pam_rootok.so >> + >> +# The standard Unix authentication modules, used with >> +# NIS (man nsswitch) as well as normal /etc/passwd and >> +# /etc/shadow entries. >> +auth include common-auth >> + >> diff --git a/meta-networking/recipes-protocols/quagga/quagga.inc >> b/meta-networking/recipes-protocols/quagga/quagga.inc >> index 2106c9b..52cd7a3 100644 >> --- a/meta-networking/recipes-protocols/quagga/quagga.inc >> +++ b/meta-networking/recipes-protocols/quagga/quagga.inc >> @@ -32,10 +32,12 @@ SRC_URI = >> "http://download.savannah.gnu.org/releases/quagga${QUAGGASUBDIR}/quagg >> file://watchquagga.init \ >> file://watchquagga.default \ >> file://volatiles.03_quagga \ >> + file://file://quagga.pam \ > > Why is there be two file://? > Oh, sorry for the typo, I have updated the git to correct this. git://git.pokylinux.org/poky-contrib hongxu/fix-quagga-pam http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/fix-quagga-pam Thanks, Hongxu >> file://ripd-fix-two-bugs-after-received-SIGHUP.patch" >> >> -PACKAGECONFIG ??= "" >> +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', >> '', d)}" >> PACKAGECONFIG[cap] = >> "--enable-capabilities,--disable-capabilities,libcap" >> +PACKAGECONFIG[pam] = "--with-libpam, --without-libpam, libpam" >> >> inherit autotools update-rc.d useradd >> >> @@ -98,6 +100,15 @@ do_install () { >> # Remove generated info dir file, it doesn't belong in the >> generated >> # package. >> rm -f ${D}${infodir}/dir >> + >> + # For PAM >> + for feature in ${DISTRO_FEATURES}; do >> + if [ "$feature" = "pam" ]; then >> + install -D -m 644 ${WORKDIR}/quagga.pam >> ${D}/${sysconfdir}/pam.d/quagga >> + break >> + fi >> + done >> + > > > Could you use the below method to simply this loop > > if > ${@base_contains('DISTRO_FEATURES','sysvinit','false','true',d)};then > if > > -Roy > >> } >> >> # Split into a main package and separate per-protocol packages >> >