From 50b09826f8edf483e187f6b8a1120e782a95c49e Mon Sep 17 00:00:00 2001
From: udeved <flower_of_life@gmx.net>
Date: Sat, 13 Dec 2014 03:40:53 +0100
Subject: [PATCH] move pwgen to util.sh

---
 lib/util.sh   | 4 ++++
 livecd/livecd | 6 ------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/util.sh b/lib/util.sh
index 482f066..ef23504 100644
--- a/lib/util.sh
+++ b/lib/util.sh
@@ -358,6 +358,10 @@ load_pacman_conf(){
     return 0
 }
 
+gen_pw(){
+    echo $(perl -e 'print crypt($ARGV[0], "password")' ${password})
+}
+
 load_sets(){
     local prof temp
     for item in $(ls ${profiledir}/*.set); do
diff --git a/livecd/livecd b/livecd/livecd
index 9fd1bc2..93faff3 100755
--- a/livecd/livecd
+++ b/livecd/livecd
@@ -93,14 +93,8 @@ if [ -e "/usr/bin/gnome-keyring-daemon" ] ; then
    setcap cap_ipc_lock=ep /usr/bin/gnome-keyring-daemon &> /dev/null
 fi
 
-gen_pw(){
-    echo $(perl -e 'print crypt($ARGV[0], "password")' ${password})
-}
-
 useradd -m -g users -G ${addgroups} -p $(gen_pw) ${username}
 
-
-
 # configurate pacman
 #pacman-key --init
 #pacman-key --populate archlinux manjaro