From 6b8ed88c5b06e60b15901178485ce8a2b5cdf5ca Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Mon, 3 Jul 2017 11:12:42 -0500
Subject: Update ROOT_PASSWD* to MTADM_PASSWD*

---
 classes/mlinux-image.bbclass         | 6 +++---
 conf/distro/mlinux.conf              | 4 ++--
 recipes-core/multitech/config_1.0.bb | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/classes/mlinux-image.bbclass b/classes/mlinux-image.bbclass
index 580901d..6d8ff60 100644
--- a/classes/mlinux-image.bbclass
+++ b/classes/mlinux-image.bbclass
@@ -2,14 +2,14 @@
 # having file mod times of zero confuses cron
 IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.jffs2 ${EXTRA_IMAGECMD}"
 
-# set specified mtadm password in image using ROOT_PASSWORD_HASH
+# set specified mtadm password in image using MTADM_PASSWORD_HASH
 mlinux_set_root_password () {
     echo IMAGE_ROOTFS is ${IMAGE_ROOTFS} >/tmp/m_set_root_pwd.txt
     ls ${IMAGE_ROOTFS} >/tmp/ls_pwd.txt
     if [ -e ${IMAGE_ROOTFS}/etc/shadow ]; then
-        sed -i 's%^mtadm:[^:]*:%mtadm:${ROOT_PASSWORD_HASH}:%' ${IMAGE_ROOTFS}/etc/shadow
+        sed -i 's%^mtadm:[^:]*:%mtadm:${MTADM_PASSWORD_HASH}:%' ${IMAGE_ROOTFS}/etc/shadow
     elif [ -e ${IMAGE_ROOTFS}/etc/passwd ]; then
-        sed -i 's%^mtadm:[^:]*:%mtadm:${ROOT_PASSWORD_HASH}:%' ${IMAGE_ROOTFS}/etc/passwd
+        sed -i 's%^mtadm:[^:]*:%mtadm:${MTADM_PASSWORD_HASH}:%' ${IMAGE_ROOTFS}/etc/passwd
     fi
 }
 ROOTFS_POSTPROCESS_COMMAND += "mlinux_set_root_password;"
diff --git a/conf/distro/mlinux.conf b/conf/distro/mlinux.conf
index d09700e..b352800 100644
--- a/conf/distro/mlinux.conf
+++ b/conf/distro/mlinux.conf
@@ -47,8 +47,8 @@ TCLIBCAPPEND = ""
 IPKG_VARIANT = "opkg"
 DEFAULT_TIMEZONE = "America/Chicago"
 
-# default root password
-ROOT_PASSWORD_HASH ?= "e97PZLy9l09O6"
+# default mtadm password
+MTADM_PASSWORD_HASH ?= "e97PZLy9l09O6"
 
 SANITY_TESTED_DISTROS ?= " \
             Ubuntu-12.04 \n \
diff --git a/recipes-core/multitech/config_1.0.bb b/recipes-core/multitech/config_1.0.bb
index 383baed..2c5a09c 100644
--- a/recipes-core/multitech/config_1.0.bb
+++ b/recipes-core/multitech/config_1.0.bb
@@ -28,7 +28,7 @@ fakeroot do_install () {
     install -m 0644 ${WORKDIR}/defaults.tar.gz ${D}${sysconfdir}/defaults.tar.gz
 
     # save root password for resetting to defaults
-    echo -n '${ROOT_PASSWORD_HASH}' > ${D}${sysconfdir}/default_pass
+    echo -n '${MTADM_PASSWORD_HASH}' > ${D}${sysconfdir}/default_pass
     chmod 400 ${D}${sysconfdir}/default_pass
 
     # init script
-- 
cgit v1.2.3