From 0af0ac9ee754c9cb94ae236d8619ede2f14c654b Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Wed, 9 Aug 2017 13:35:30 -0500
Subject: fix faulty merge from previous integration

---
 conf/distro/mlinux.conf | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/conf/distro/mlinux.conf b/conf/distro/mlinux.conf
index 52799b8..34ddc40 100644
--- a/conf/distro/mlinux.conf
+++ b/conf/distro/mlinux.conf
@@ -1,7 +1,7 @@
 DISTRO = "mlinux"
 DISTRO_NAME = "mLinux"
-DISTRO_BASE_VERSION = "4.0"
-DISTRO_VERSION = "${DISTRO_BASE_VERSION}.0dev4"
+DISTRO_BASE_VERSION = "3.3"
+DISTRO_VERSION = "${DISTRO_BASE_VERSION}.9"
 DISTRO_CODENAME = ""
 SDK_VENDOR = "-mlinux"
 SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
@@ -36,7 +36,7 @@ DISTRO_EXTRA_RDEPENDS += "mlinux-version"
 INHERIT += "mlinux-mirrors"
 
 # Package feed configuration
-DISTRO_FEED_URI = "http://multitech.net/mlinux/feeds/${DISTRO_BASE_VERSION}"
+DISTRO_FEED_URI = "http://multitech.net/mlinux/feeds/${DISTRO_VERSION}"
 DISTRO_FEED_PREFIX = "mlinux"
 
 EXTRAOPKGCONFIG = ""
@@ -47,8 +47,8 @@ TCLIBCAPPEND = ""
 IPKG_VARIANT = "opkg"
 DEFAULT_TIMEZONE = "America/Chicago"
 
-# default mtadm password
-MTADM_PASSWORD_HASH ?= "e97PZLy9l09O6"
+# default root password
+ROOT_PASSWORD_HASH ?= "e97PZLy9l09O6"
 
 SANITY_TESTED_DISTROS ?= " \
             Ubuntu-12.04 \n \
-- 
cgit v1.2.3