RomanNum3ral
/
ArchTitus
mirror of https://github.com/ChrisTitusTech/ArchTitus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

more console output and copying logs to installation, fix copy configs

This commit is contained in:
Austin Horstman 2022-02-18 08:37:02 -06:00
parent 17eea517f4
commit e21015e235
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archtitus.sh
View File

@ -20,7 +20,7 @@ echo -ne "
Scripts are in directory named ArchTitus Scripts are in directory named ArchTitus
" "
( bash $SCRIPT_DIR/scripts/startup.sh )|& tee startup.log ( bash $SCRIPT_DIR/scripts/startup.sh )|& tee startup.log
source $SCRIPT_DIR/configs/setup.conf source $CONFIGS_DIR/setup.conf
( bash $SCRIPT_DIR/scripts/0-preinstall.sh )|& tee 0-preinstall.log ( bash $SCRIPT_DIR/scripts/0-preinstall.sh )|& tee 0-preinstall.log
( arch-chroot /mnt /root/ArchTitus/scripts/1-setup.sh )|& tee 1-setup.log ( arch-chroot /mnt /root/ArchTitus/scripts/1-setup.sh )|& tee 1-setup.log
if [[ ! $DESKTOP_ENV == server ]]; then if [[ ! $DESKTOP_ENV == server ]]; then

2
scripts/0-preinstall.sh
View File

@ -122,7 +122,7 @@ elif [[ "${FS}" == "luks" ]]; then
mount -t btrfs ${partition3} /mnt mount -t btrfs ${partition3} /mnt
subvolumesetup subvolumesetup
# store uuid of encrypted partition for grub # store uuid of encrypted partition for grub
echo ENCRYPTED_PARTITION_UUID=$(blkid -s UUID -o value ${partition3}) >> $CONFIG_DIR/setup.conf echo ENCRYPTED_PARTITION_UUID=$(blkid -s UUID -o value ${partition3}) >> $CONFIGS_DIR/setup.conf
fi fi
# mount target # mount target

24
scripts/3-post-setup.sh
View File

@ -15,9 +15,13 @@ echo -ne "
Final Setup and Configurations Final Setup and Configurations
GRUB EFI Bootloader Install & Check GRUB EFI Bootloader Install & Check
" "
source /root/ArchTitus/configs/setup.conf source ${HOME}/ArchTitus/configs/setup.conf
genfstab -U -p / >> /etc/fstab genfstab -U -p / >> /etc/fstab
echo "
Generated /etc/fstab:
"
cat /etc/fstab cat /etc/fstab
if [[ -d "/sys/firmware/efi" ]]; then if [[ -d "/sys/firmware/efi" ]]; then
grub-install --efi-directory=/boot ${DISK} grub-install --efi-directory=/boot ${DISK}
fi fi
@ -83,12 +87,18 @@ echo -ne "
------------------------------------------------------------------------- -------------------------------------------------------------------------
" "
systemctl enable cups.service systemctl enable cups.service
echo " Cups enabled"
ntpd -qg ntpd -qg
systemctl enable ntpd.service systemctl enable ntpd.service
echo " NTP enabled"
systemctl disable dhcpcd.service systemctl disable dhcpcd.service
echo " DHCP disabled"
systemctl stop dhcpcd.service systemctl stop dhcpcd.service
echo " DHCP stopped"
systemctl enable NetworkManager.service systemctl enable NetworkManager.service
echo " NetworkManager enabled"
systemctl enable bluetooth systemctl enable bluetooth
echo " Bluetooth enabled"
if [[ "${FS}" == "luks" || "${FS}" == "btrfs" ]]; then if [[ "${FS}" == "luks" || "${FS}" == "btrfs" ]]; then
echo -ne " echo -ne "
@ -97,11 +107,13 @@ echo -ne "
------------------------------------------------------------------------- -------------------------------------------------------------------------
" "
SNAPPER_CONF="/root/ArchTitus/configs/etc/snapper/configs/root" SNAPPER_CONF="${HOME}/ArchTitus/configs/etc/snapper/configs/root"
SNAPPER_CONF_D="/root/ArchTitus/configs/etc/conf.d/snapper" SNAPPER_CONF_D="${HOME}/ArchTitus/configs/etc/conf.d/snapper"
cp -a ${SNAPPER_CONF} /home/$USERNAME/etc/snapper/configs/ mkdir -p /home/$USERNAME/etc/snapper/configs/
cp -a ${SNAPPER_CONF_D} /home/$USERNAME/etc/conf.d/ mkdir -p /home/$USERNAME/etc/conf.d/
cp --verbose -af ${SNAPPER_CONF} /home/$USERNAME/etc/snapper/configs/
cp --verbose -af ${SNAPPER_CONF_D} /home/$USERNAME/etc/conf.d/
fi fi
@ -117,6 +129,8 @@ sed -i 's/^%wheel ALL=(ALL:ALL) NOPASSWD: ALL/# %wheel ALL=(ALL:ALL) NOPASSWD: A
sed -i 's/^# %wheel ALL=(ALL) ALL/%wheel ALL=(ALL) ALL/' /etc/sudoers sed -i 's/^# %wheel ALL=(ALL) ALL/%wheel ALL=(ALL) ALL/' /etc/sudoers
sed -i 's/^# %wheel ALL=(ALL:ALL) ALL/%wheel ALL=(ALL:ALL) ALL/' /etc/sudoers sed -i 's/^# %wheel ALL=(ALL:ALL) ALL/%wheel ALL=(ALL:ALL) ALL/' /etc/sudoers
cp --verbose -a ${HOME}/ArchTitus/*.log /home/$USERNAME/
rm -r /root/ArchTitus rm -r /root/ArchTitus
rm -r /home/$USERNAME/ArchTitus rm -r /home/$USERNAME/ArchTitus