root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

tackle the unmounting problem;

Browse source 
user creation works but login fails
This commit is contained in:
udeved 2014-12-10 14:01:02 +01:00
parent 4f4bf78ea3
commit fd3a8d3730
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bin/mkiso.in
View file

@ -126,11 +126,11 @@ _pacman ()
mkdir -p "${work_dir}/${IMAGE_FOLDER}/var/lib/pacman"
if [ "${QUIET}" = "y" ]; then
setarch ${ARCH} basestrap -GMcd "${work_dir}/${IMAGE_FOLDER}" --config "$PACCONFIG" $* &> /dev/null
echo "$version" > "${work_dir}/.manjaro-tools"
echo "$version" > "${work_dir}/${IMAGE_FOLDER}/.manjaro-tools"
ret=$?
else
setarch ${ARCH} basestrap -GMcd "${work_dir}/${IMAGE_FOLDER}" --config "$PACCONFIG" $*
echo "$version" > "${work_dir}/.manjaro-tools"
echo "$version" > "${work_dir}/${IMAGE_FOLDER}/.manjaro-tools"
ret=$?
fi

8
lib/util-iso.sh
View file

@ -14,7 +14,7 @@ set_dm(){
# do_setuplightdm
if [ -e "$1/usr/bin/lightdm" ] ; then
#mkdir -p /run/lightdm > /dev/null
mkdir -p /run/lightdm > /dev/null
#getent group lightdm > /dev/null 2>&1 || groupadd -g 620 lightdm
#getent passwd lightdm > /dev/null 2>&1 || useradd -c 'LightDM Display Manager' -u 620 -g lightdm -d /var/run/lightdm -s /usr/bin/nologin lightdm
#passwd -l lightdm > /dev/null
@ -440,10 +440,10 @@ make_root_image() {
echo ${hostname} > ${work_dir}/root-image/etc/hostname
fi
# setup user
msg2 "Creating user ${username} ..."
local addgroups="video,audio,power,disk,storage,optical,network,lp,scanner"
chroot-run ${work_dir}/root-image useradd -m -p "" -g users -G $addgroups ${username}
chroot-run ${work_dir}/root-image echo "${username}:${username}" | chpasswd
local pass=$(perl -e 'print crypt($ARGV[0], "password")' $username)
chroot-run ${work_dir}/root-image useradd -m -g users -G $addgroups -p $pass ${username}
# Change to given branch in options.conf
sed -i -e "s/stable/$branch/" ${work_dir}/root-image/etc/pacman.d/mirrorlist