[oe-commits] Anders Darander : webmin: allow override of webmin login and password
git at git.openembedded.org
git at git.openembedded.org
Wed Jun 18 17:10:06 UTC 2014
Module: meta-openembedded.git
Branch: master
Commit: b67780140ee4cdbb874c99ef83e1ca616f038c42
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=b67780140ee4cdbb874c99ef83e1ca616f038c42
Author: Anders Darander <anders at chargestorm.se>
Date: Fri Jun 13 15:01:20 2014 +0200
webmin: allow override of webmin login and password
Don't hardcode the webmin login and password in the install script.
Instead, extract them to variables, to allow us to override them in
a bbappend.
Signed-off-by: Anders Darander <anders at chargestorm.se>
---
meta-webserver/recipes-webadmin/webmin/webmin_1.620.bb | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/meta-webserver/recipes-webadmin/webmin/webmin_1.620.bb b/meta-webserver/recipes-webadmin/webmin/webmin_1.620.bb
index 8822b92..a561de2 100644
--- a/meta-webserver/recipes-webadmin/webmin/webmin_1.620.bb
+++ b/meta-webserver/recipes-webadmin/webmin/webmin_1.620.bb
@@ -65,6 +65,9 @@ do_configure() {
sed -i "s/find_pid_command=.*/find_pid_command=pidof NAME/" config-generic-linux
}
+WEBMIN_LOGIN ?= "admin"
+WEBMIN_PASSWORD ?= "password"
+
do_install() {
install -d ${D}${sysconfdir}
install -d ${D}${sysconfdir}/webmin
@@ -92,8 +95,8 @@ do_install() {
export real_os_type="${DISTRO_NAME}"
export real_os_version="${DISTRO_VERSION}"
export port=10000
- export login=admin
- export password=password
+ export login=${WEBMIN_LOGIN}
+ export password=${WEBMIN_PASSWORD}
export ssl=0
export atboot=1
export no_pam=1
More information about the Openembedded-commits
mailing list