diff --git a/etc/base b/etc/base index c3c5daf..6193e65 100644 --- a/etc/base +++ b/etc/base @@ -27,6 +27,7 @@ xbps-reconfigure -f glibc-locales enable_service acpid cronie socklog-unix nanoklogd uuidd agetty-tty1 agetty-tty2 agetty-tty3 agetty-tty4 isc-ntpd udevd disable_service agetty-tty6 agetty-tty5 + cat < /etc/fstab tmpfs /tmp tmpfs defaults,nosuid,nodev 0 0 /dev/mapper/vg_${TARGETNAME_UNDERSCORE}-root / btrfs defaults,subvol=rootfs 0 0 @@ -47,9 +48,6 @@ else fi fi - - - if [ "$ENCRYPTION_STYLE" == "a" ] || [ "$ENCRYPTION_STYLE" == "d" ]; then dd bs=1 count=64 if=/dev/urandom of=/boot/volume.key echo -n "${PASS}" | cryptsetup luksAddKey $TARGET_PHY_ID-part${TARGET_PART} /boot/volume.key @@ -73,10 +71,7 @@ if [ "$ENC" == "1" ]; then fi useradd -G wheel,socklog,audio,video,floppy,cdrom,optical,input,users -U -m -s /usr/bin/bash -c "${USERNAME}" "${USERNAME}" -if grep -q lpadmin /etc/group; then - usermod -a -G lpadmin "${USERNAME}" -fi - +grep -q lpadmin /etc/group && usermod -a -G lpadmin "${USERNAME}" echo -e "${PASS}\n${PASS}" | passwd "${USERNAME}" passwd -dl root @@ -108,7 +103,6 @@ fi echo '0 * * * * /usr/bin/void-snapshot cron #void.system' > /var/spool/cron/root - vbin "${FILESDIR}/bin/joinvpn" vbin "${FILESDIR}/bin/void-update" vbin "${FILESDIR}/bin/void-backup" diff --git a/etc/profile/plasma b/etc/profile/plasma index 87593f4..2755d05 100644 --- a/etc/profile/plasma +++ b/etc/profile/plasma @@ -25,7 +25,7 @@ packages() { config() { enable_service dbus sddm - if ! [ "${KEY_LANG}" == "en" ]; then + if ! [ "${LANGUAGE}" == "en" ]; then echo "export LANG=${L1}.UTF-8" > /etc/sv/sddm/conf fi }