From 801d6da6291937e49d6d54514ba66a660960cc7d Mon Sep 17 00:00:00 2001
From: udeved <flower_of_life@gmx.net>
Date: Wed, 17 Dec 2014 04:32:01 +0100
Subject: [PATCH] move root pw to livecd script

---
 lib/util-iso.sh    | 13 -------------
 lib/util-livecd.sh |  8 ++++++++
 scripts/livecd     |  2 +-
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/lib/util-iso.sh b/lib/util-iso.sh
index fe7c6cb..387170f 100644
--- a/lib/util-iso.sh
+++ b/lib/util-iso.sh
@@ -27,16 +27,6 @@ configure_user(){
     chroot-run $1 useradd -m -g users -G ${addgroups} -p $(gen_pw) ${username}
 }
 
-# $1: chroot
-configure_user_root(){
-    # set up root password
-    msg2 "Setting root password: ${password} ..."
-    # currently disabled again, still not working, still screws up real root pw
-    msg2 "Currently disabled until fixed"
-    #echo "root:$(gen_pw)" | chroot-run $1 chpasswd
-    #echo "root:${password}" | chroot-run $1 chpasswd
-}
-
 # $1: chroot
 configure_hostname(){
     msg2 "Setting hostname: ${hostname} ..."
@@ -575,9 +565,6 @@ make_overlay_image() {
 
 	pacman -Qr "${work_dir}/overlay-image" > "${work_dir}/overlay-image/overlay-image-pkgs.txt"
 	
-	# TODO: fix this, screws up root password on build system
-	#configure_user_root "${work_dir}/overlay-image"
-	
 	configure_user "${work_dir}/overlay-image"
 		
 	configure_displaymanager "${work_dir}/overlay-image"
diff --git a/lib/util-livecd.sh b/lib/util-livecd.sh
index 12b8ed5..72003eb 100644
--- a/lib/util-livecd.sh
+++ b/lib/util-livecd.sh
@@ -235,6 +235,14 @@ configure_env_live(){
     fi
 }
 
+configure_user_root_live(){
+    # set up root password
+    msg2 "Setting root password: ${password} ..."
+    echo "root:${password}" | chroot ${DESTDIR} chpasswd
+    cp -a /etc/skel/. /root/
+
+}
+
 configure_alsa_live(){
     #set_alsa
     # amixer binary
diff --git a/scripts/livecd b/scripts/livecd
index 5097844..c15d11d 100755
--- a/scripts/livecd
+++ b/scripts/livecd
@@ -47,7 +47,7 @@ echo "configure system" >> /tmp/livecd.log
 configure_env_live
 
 # do_configsforroot
-cp -a /etc/skel/. /root/
+configure_user_root_live
 
 echo "configure sudoers" >> /tmp/livecd.log