1
0

Merge branch 'master' of Jybz/mageia4arm into master

This commit is contained in:
DTux 2020-01-03 15:19:15 +00:00 committed by Gogs
commit 415110895e
2 changed files with 25 additions and 7 deletions

View File

@ -231,8 +231,25 @@ function preparechroot()
exit ${ERR_1}
fi
info "creation of user account"
echo -e "/bin/passwd << EOF\n${ROOT_PWD}\n${ROOT_PWD}\nEOF\n /sbin/useradd ${ID_USER}\n /bin/passwd ${ID_USER} << EOF\n${PASSWORD}\n${PASSWORD}\nEOF" >>"${BUILD_PATH}/second_stage_install.sh"
info "Preparation for setting root and user account"
if [ -n "${ROOT_PWD}" ]; then #If root password defined, it will be setted at the end of the chroot of the second_stage_install.sh script
echo -e " /bin/passwd << EOF\n${ROOT_PWD}\n${ROOT_PWD}\nEOF\n" >>"${BUILD_PATH}/second_stage_install.sh"
else
info "No root password... One password will be set at the first login."
echo -e " /bin/passwd -d root\n /bin/passwd -e root\n" >>"${BUILD_PATH}/second_stage_install.sh"
fi
if [ -n "${ID_USER}" ]; then #If user ID defined, it will be setted at the end of the chroot of the second_stage_install.sh script
echo -e " /sbin/useradd ${ID_USER}\n" >>"${BUILD_PATH}/second_stage_install.sh"
if [ -n "${PASSWORD}" ]; then
echo -e " /bin/passwd ${ID_USER} << EOF\n${PASSWORD}\n${PASSWORD}\nEOF" >>"${BUILD_PATH}/second_stage_install.sh"
else
echo -e " /bin/passwd -d ${ID_USER}\n" >>"${BUILD_PATH}/second_stage_install.sh"
fi
else
info "No user defined, no user account created."
fi
# info "Copying skel in root directory"
# /bin/rsync -rlptH "${BUILD_PATH}/etc/skel/" "${BUILD_PATH}/root/"

View File

@ -54,15 +54,16 @@ BOOT="/mnt/boot"
ROOT="/mnt/root"
# Default user
# TO MODIFY
ID_USER="banana"
PASSWORD="bananaPro"
# If not set, no user will be defined.
# ID_USER="banana"
# PASSWORD="bananaPro"
#root password
ROOT_PWD="ProR00t"
#If not set, no root password, at the first login, the system will ask for a password.
# ROOT_PWD="ProR00t"
#Hostname
HOSTNAME="${TARGET}.${ID_USER}"
HOSTNAME="${TARGET}"
#Filesystem of boot partitions (default ext4 raspberry pi need vfat)
SEPARATE_BOOT_PARTITION=0