Fix user login generation

Fix root.conf export format

diff --git a/config/user.conf b/config/user.conf
index c35d523d68e62d0578dc22c0b5df5c1696815b5b..c7df1ef0ab4f6fa55b21ceb13bedf885be8d747c 100644 (file)
--- a/config/user.conf
+++ b/config/user.conf
@@ -1,4 +1,4 @@
-# User login (apg -M L -a 0 -m 8 -x 8 -d -n 1)
-USERLOGIN=`apg -M L -a 0 -m 8 -x 8 -d -n 1`
+# User login (tr -dc 'a-z' < /dev/urandom | fold -w 8 | head -n 1)
+USERLOGIN=`tr -dc 'a-z' < /dev/urandom | fold -w 8 | head -n 1`
 # User password (apg -m 32 -x 32 -a 0 -d -n 1)
 USERPASS=`apg -m 32 -x 32 -a 0 -d -n 1`

diff --git a/lib/export.sh b/lib/export.sh
index 40e37045e55e50fdeba81957d68cc0b8c7e4710e..c443936d88e5a6a57f9fe3db45f5c74550b0420f 100644 (file)
--- a/lib/export.sh
+++ b/lib/export.sh
@@ -5,5 +5,5 @@ cat /dev/null > root.conf
 
 # Append every config parameters
 for i in `cat config/*.conf | perl -pne 'undef $_ if /^#/; s/=.*$//'`; do
-       eval echo ${i}=\'\$$i\' | tee -a root.conf
+       echo "$i='$(eval echo \$$i)'" | tee -a root.conf
 done