forked from mirrored-repos/manjaro-tools
move root pw to livecd script
This commit is contained in:
parent
d1fa2bdfa4
commit
801d6da629
3 changed files with 9 additions and 14 deletions
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue