diff options
Diffstat (limited to 'install.sh')
| -rwxr-xr-x | install.sh | 28 |
1 files changed, 6 insertions, 22 deletions
@@ -170,16 +170,7 @@ mount "${boot}" /mnt/boot pacman -Syy # Base packages -basestrap /mnt \ - base base-devel \ - dinit - -if [[ "${elogind}" == true ]]; then - basestrap /mnt elogind-dinit -else - # install seatd & turnstile in-place of elogind - basestrap /mnt seatd-dinit turnstile-dinit -fi +basestrap /mnt base base-devel dinit elogind-dinit # Linux & utilities basestrap /mnt --needed \ @@ -221,7 +212,6 @@ basestrap /mnt --needed \ # Enable services services="dbus ufw iwd dhcpcd ntpd" -[[ "${elogind}" == false ]] && services+=" turnstiled seatd" # Generate file-system table fstabgen -L /mnt >> /mnt/etc/fstab @@ -260,7 +250,6 @@ EOF artix-chroot /mnt bash -c "echo root:artix | chpasswd" # Add new user -[[ "${elogind}" == false ]] && user_groups+=",seat" artix-chroot /mnt bash -c "useradd -mG ${user_groups} ${user}" artix-chroot /mnt bash -c "echo \"${user}:${password}\" | chpasswd" @@ -331,22 +320,17 @@ done # Enable firewall sed "s/ENABLED=no/ENABLED=yes/" -i /mnt/etc/ufw/ufw.conf -# When using elogind -if [[ "${elogind}" == false ]]; then - # Manage rundir with turnstile when not using elogind - sed "s/manage_rundir = no/manage_rundir = yes/" -i /mnt/etc/turnstile/turnstiled.conf -else - # Enable iwd's DHCP client (in-place of dhcpcd when using elogind) - [[ ! -d /mnt/etc/iwd ]] && mkdir /mnt/etc/iwd - echo " +# Enable iwd's DHCP client (instead of dhcpcd) +[[ ! -d /mnt/etc/iwd ]] && mkdir /mnt/etc/iwd +echo " [General] EnableNetworkConfiguration=true [Network] NameResolvingService=resolvconf " > /mnt/etc/iwd/main.conf - unlink /mnt/etc/dinit.d/boot.d/dhcpcd -fi + +unlink /mnt/etc/dinit.d/boot.d/dhcpcd # Set MAKEFLAGS to match CPU threads for faster compiling cp /etc/makepkg.conf /etc/makepkg.conf.bak |