xstefen/al-installer
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: xinit setup

Browse Source
This commit is contained in:
natemaia 2018-12-14 22:00:59 -08:00
parent 9f49dfcec8
commit 0572d16454
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/archlabs-installer
View File

@ -10,7 +10,7 @@
# immutable globals # immutable globals
readonly VER="1.7.33" # Installer version readonly VER="1.7.34" # Installer version
readonly DIST="ArchLabs" # Linux distributor readonly DIST="ArchLabs" # Linux distributor
readonly MNT="/mnt" # Install mountpoint readonly MNT="/mnt" # Install mountpoint
readonly ERR="/tmp/errlog" # Built-in error log readonly ERR="/tmp/errlog" # Built-in error log

14
src/lib/install.sh
View File

@ -177,9 +177,13 @@ EOF
create_user() create_user()
{ {
# set root password # set root password and shell if needed
chrun "chpasswd <<< 'root:$ROOT_PASS'" chrun "chpasswd <<< 'root:$ROOT_PASS'"
[[ $MYSHELL == *zsh ]] || chrun "usermod -s $MYSHELL root"
if [[ $MYSHELL != *zsh ]]; then
chrun "usermod -s $MYSHELL root"
cp -f $MNT/etc/skel/.mkshrc /root/.mkshrc
fi
local groups='audio,autologin,floppy,log,network,rfkill,scanner,storage,optical,power,wheel' local groups='audio,autologin,floppy,log,network,rfkill,scanner,storage,optical,power,wheel'
@ -253,7 +257,7 @@ EOF
if [[ $AUTOLOGIN == true ]]; then if [[ $AUTOLOGIN == true ]]; then
sed -i "s/root/${NEWUSER}/g" $SERVICE/autologin.conf sed -i "s/root/${NEWUSER}/g" $SERVICE/autologin.conf
cat >> $MNT/home/$NEWUSER/$loginrc << EOF cat > $MNT/home/$NEWUSER/$loginrc << EOF
# ~/$loginrc # ~/$loginrc
# sourced by $(basename $MYSHELL) when used as a login shell # sourced by $(basename $MYSHELL) when used as a login shell
@ -289,7 +293,7 @@ EOF
login_manager() login_manager()
{ {
SERVICE="$MNT/etc/systemd/system/getty@tty1.service.d" declare -g SERVICE="$MNT/etc/systemd/system/getty@tty1.service.d"
# remove welcome message # remove welcome message
sed -i '/printf/d' $MNT/root/.zshrc sed -i '/printf/d' $MNT/root/.zshrc
@ -297,7 +301,7 @@ login_manager()
if [[ $LOGIN_TYPE == 'lightdm' ]]; then if [[ $LOGIN_TYPE == 'lightdm' ]]; then
setup_lightdm setup_lightdm
else else
setup_shell_xinit setup_xinit
fi fi
} }