From e0462a4b35da8fcfeea385709deff57f10c0e9fa Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Wed, 22 Jul 2020 17:35:52 -0500
Subject: Alternative to commissioning for test images

---
 recipes-core/useradd/useradd.bb | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'recipes-core')

diff --git a/recipes-core/useradd/useradd.bb b/recipes-core/useradd/useradd.bb
index 29d6508..d229a2f 100644
--- a/recipes-core/useradd/useradd.bb
+++ b/recipes-core/useradd/useradd.bb
@@ -7,9 +7,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
 S = "${WORKDIR}"
-user = "mtadm"
-home = "/home/${user}"
-FILES_${PN} = "${home}/.ssh"
+
 inherit useradd
 
 # You must set USERADD_PACKAGES when you inherit useradd. This
@@ -30,28 +28,30 @@ GROUPADD_PARAM_${PN} = "-r  -g 27 sudo"
 # useradd command. Multiple users can be created by separating
 # the commands with a semicolon. Here we'll create two users,
 # user1 and user2:
-USERADD_PARAM_${PN} = "-u 50 -G sudo,disk,dialout -m -r -s /bin/bash ${user}"
+USERADD_PARAM_${PN} = "-u 50 -G sudo,disk,dialout -m -r -s /bin/bash mtadm"
 
 do_install () {
         # If the recipe doesn't have a file, the ipk
         # is deleted, and it does nothing.
         # Create a .ssh directory for mtadm.
-        install -d 0700 ${D}/${FILES_${PN}}
-	chown mtadm:mtadm ${D}/${home}
-	chown mtadm:mtadm ${D}/${FILES_${PN}}
+        install -d 0700 ${D}/home/mtadm/.ssh
+	chown mtadm:mtadm ${D}/home/mtadm
+	chown mtadm:mtadm ${D}/home/mtadm/.ssh
 }
 
+FILES_${PN} = "/home/mtadm/.ssh"
+
 # Prevents do_package failures with:
 # debugsources.list: No such file or directory:
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 
 pkg_postinst_${PN} () {
-   profile=${home}/.profile
+   profile=$D/home/mtadm/.profile
    if ! grep 'sbin' ${profile} ; then
      Sub='${PA'
      Sub=${Sub}'TH}:/sbin:/usr/sbin'
-     echo 'PATH='${Sub} >>$D/${home}/.profile
-     echo 'export PATH'  >>$D/${home}/.profile
+     echo 'PATH='${Sub} >>${profile}
+     echo 'export PATH'  >>${profile}
    fi
    # If doing an update, we need to add mtadm to dialout.
    # If the admin has been changed, then the user must
-- 
cgit v1.2.3