Patchwork [05/10] ppp-dialin: use useradd.bbclass instead of hardcoded adduser/deluser calls

login
register
mail settings
Submitter Martin Jansa
Date Nov. 29, 2011, 7 a.m.
Message ID <a3d738155db5af1ff330b03b59f63d41a35e0e64.1322549636.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/15511/
State Accepted
Commit 942739b6a1e786a06b6aa67f6be8158232a9f98a
Headers show

Comments

Martin Jansa - Nov. 29, 2011, 7 a.m.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../ppp-dialin/ppp-dialin_0.1.bb                   |   23 +++++--------------
 1 files changed, 6 insertions(+), 17 deletions(-)

Patch

diff --git a/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb b/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb
index d4ac77e..d239c20 100644
--- a/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb
+++ b/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb
@@ -2,7 +2,7 @@  SECTION = "console/network"
 DESCRIPTION = "Enables PPP dial-in through a serial connection"
 DEPENDS = "ppp"
 RDEPENDS_${PN} = "ppp"
-PR = "r7"
+PR = "r8"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
@@ -10,7 +10,7 @@  LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 SRC_URI = "file://host-peer \
            file://ppp-dialin"
 
-inherit allarch
+inherit allarch useradd
 
 do_install() {
 	install -d ${D}${sysconfdir}/ppp/peers
@@ -20,18 +20,7 @@  do_install() {
 	install -m 0755 ${WORKDIR}/ppp-dialin ${D}${sbindir}
 }
 
-pkg_postinst_${PN} () {
-if test "x$D" != "x"; then
-	exit 1
-else
-	adduser --system --home /dev/null --no-create-home --empty-password --ingroup nogroup -s ${sbindir}/ppp-dialin ppp
-fi
-}
-
-pkg_postrm_${PN} () {
-if test "x$D" != "x"; then
-	exit 1
-else
-	deluser ppp
-fi
-}
+USERADD_PACKAGES = "${PN}"
+USERADD_PARAM_${PN} = "--system --home /dev/null \
+                       --no-create-home --shell ${sbindir}/ppp-dialin \
+                       --no-user-group --gid nogroup ppp"