diff --git a/gentoo.sh b/gentoo.sh index 0fb07b8..72e5cef 100644 --- a/gentoo.sh +++ b/gentoo.sh @@ -31,10 +31,10 @@ echo HARD_DISK=$2 ###################################### USER="verita84" -USER_PASSWORD="123456" -ROOT_PASSWORD="123456" -WIRELESS_PASSWORD='123456' -SSID='123456' +USER_PASSWORD="REM&rap234" +ROOT_PASSWORD="REM&rap234" +WIRELESS_PASSWORD='815721984' +SSID='Tribble' WIRELESS_INTERFACE='wlan0' COMPRESSION='compress=zstd:10' FLATPAKS+=() @@ -155,7 +155,7 @@ systemMounts() { #CONFIGURE DATA DIRS (HOME) mkdir $TARGET/home mount -o subvol=@home $BTRFS $TARGET/home - mkdir $TARGET/home/$USER + mkdir $TARGET/home/$USER } unmaskPackages() { @@ -224,7 +224,7 @@ buildGentoo() { echo #chroot $TARGET /usr/bin/emerge =sys-kernel/$(ls $TARGET/var/db/repos/gentoo/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.* | cut -d '/' -f9 | sed 's/.ebuild//' | head -1) sys-kernel/linux-firmware chroot $TARGET /usr/bin/emerge gentoo-kernel-bin sys-kernel/linux-firmware - + echo echo echo @@ -504,7 +504,7 @@ menu() { STAGE3_URL=$(curl https://www.gentoo.org/downloads/ | grep -i stage3-amd64-systemd | head -1 | cut -d '"' -f2-3 | cut -d '"' -f1) wget -O /tmp/stage3.tar.xz "$STAGE3_URL" STAGE3_FILE="/tmp/stage3.tar.xz" - + if [ -f "$STAGE3_FILE" ]; then echo echo @@ -619,27 +619,34 @@ menu() { } set-devices() { - i=0 - while [ $i != "n" ]; do - clear - echo - echo "Disks and Partitions:" - echo - cat /proc/partitions - echo - echo "Erase the line and press enter to skip to the next detected disk" - echo - i=$(expr $i + 1) - read -p 'Disk Device to Use: ' -e -i $(lsblk | grep -i disk | grep -Evi 'zram|swap' | cut -d ' ' -f1 | head -$i | tail -1) device - if [[ ! -z $device ]]; then - i="n" - fi - done + if [ -f "/tmp/disk" ]; then + HARD_DISK=$(cat /tmp/disk | head -1) + ROOT_NAME=$(cat /tmp/disk | tail -1) + else + i=0 + while [ $i != "n" ]; do + clear + echo + echo "Disks and Partitions:" + echo + cat /proc/partitions + echo + echo "Erase the line and press enter to skip to the next detected disk" + echo + i=$(expr $i + 1) + read -p 'Disk Device to Use: ' -e -i $(lsblk | grep -i disk | grep -Evi 'zram|swap' | cut -d ' ' -f1 | head -$i | tail -1) device + if [[ ! -z $device ]]; then + i="n" + fi + done - read -p 'BTRFS Root Volume name: ' -e -i "gentoo" root_name - HARD_DISK=$device + read -p 'BTRFS Root Volume name: ' -e -i "gentoo" root_name + HARD_DISK=$device + ROOT_NAME=$root_name + echo $HARD_DISK > /tmp/disk + echo $ROOT_NAME >> /tmp/disk + fi partitionDetection - ROOT_NAME=$root_name } if [ "$1" = "desktop" ]; then