From 4782da078d3f01e578578346a26f6e64f97ead47 Mon Sep 17 00:00:00 2001 From: FReenen Date: Wed, 11 Dec 2024 17:27:04 +0100 Subject: [PATCH] fix bugs --- arch-install.sh | 124 ------------------ .../elfDesktop.sfdisk | 0 elfLaptop.sfdisk => configs/elfLaptop.sfdisk | 0 configs/sshConfig | 6 +- elfDesktop.sh | 2 +- elfLaptop.sh | 2 +- elf_os.sh | 8 +- first-boot.sh | 21 +-- 8 files changed, 21 insertions(+), 142 deletions(-) delete mode 100644 arch-install.sh rename elfDesktop.sfdisk => configs/elfDesktop.sfdisk (100%) rename elfLaptop.sfdisk => configs/elfLaptop.sfdisk (100%) diff --git a/arch-install.sh b/arch-install.sh deleted file mode 100644 index baeeb8e..0000000 --- a/arch-install.sh +++ /dev/null @@ -1,124 +0,0 @@ - -HOSTNAME="CoolhavenPC" -DISK="/dev/sda" - -function run(){ - echo "[ ] $1" - echo "# $1" >>install.log - echo "> $2" >>install.log - bash -c "$2" &>>install.log \ - && echo -e "\e[1A\e[K[ \e[32mOK\e[0m ] $1" \ - || { - echo -e "\e[1A\e[K[\e[31mFAIL\e[0m] $1" - bash -c "$3" - exit - } - echo >>install.log -} - -echo "" >install.log - - -# === setup networking - -# ENDEV=enp1s1 -# IP=1.2.3.4/24 -# GATEWAY=1.2.3.1 - -# ip addr add $IP dev $ENDEV -# ip route add default via $GATEWAY dev $ENDEV -# echo "nameserver $GATEWAY" >>/dev/resolve.conf - -echo -echo === setup localisation -echo - -run "enable ntp" "timedatectl set-ntp true" -run "set timezone" "timedatectl set-timezone Europe/Amsterdam" - -echo -echo === install git and get this gist -echo - -# pacman -Sy -# pacman -S git -# git clone https://github.com/MReenen/arch-instalation.git -# cd arch-instalation - -echo === setup partitions - -# fdisk $DISK -# g -# n # boot partition -# 1 -# [default] -# +512M -# n # SWAP partition -# 2 -# [default] -# +4G -# n # recovery partition -# 3 -# [default] -# +4G -# n # system partition -# 10 -# [default] -# [default] -# w - -echo -echo === format partitions -echo - -echo -n "disk encryption password: " -read -s PASS -echo -echo -n "retype password: " -read -s PASSRE -echo - -if [ "$PASS" != "$PASSRE" ]; then - echo "password do not match" - exit -fi -echo - -run "format boot partition" "mkfs.fat ${DISK}1" -run "format swap partition" "mkswap ${DISK}2" -echo -n "$PASS" >keyfile.luks -run "encrypt root partition" "cryptsetup luksFormat --batch-mode --key-file keyfile.luks ${DISK}10" "rm keyfile.luks" -run "map root partitaion" "cryptsetup open --batch-mode --key-file keyfile.luks ${DISK}10 cryptroot" "rm keyfile.luks" -rm keyfile.luks -run "format root partition" "mkfs.btrfs /dev/mapper/cryptroot" - -echo -echo === mount all partitions -echo - -run "mount root partition" "mount /dev/mapper/cryptroot /mnt" -run "create root btrfs subvolume" "btrfs subvolume create /mnt/@" -run "create home btrfs subvolume" "btrfs subvolume create /mnt/@home" -run "unmount btrfs" "umount /mnt" -run "mount root subvolume" "mount -o subvol=@ /dev/mapper/cryptroot /mnt" -run "make root directorys" "mkdir -p /mnt/boot /mnt/home" -run "mount boot partition" "mount ${DISK}1 /mnt/boot" -run "mount home subvolume" "mount -o subvol=@home /dev/mapper/cryptroot /mnt/home" -run "enable swap" "swapon ${DISK}2" - -echo -echo === install arch -echo - -run "install base of arch" "pacstrap /mnt base linux linux-firmware grub efibootmgr" -run "intall utitlities" "pacstrap /mnt btrfs-progs man vim" - -echo "generate fstab" -genfstab -U /mnt >>/mnt/etc/fstab -run "copy in-root script" "cp in-root.sh /mnt/root" - -echo -echo === chroot config -echo - -arch-chroot /mnt bash /root/in-root.sh "$HOSTNAME" "$DISK" diff --git a/elfDesktop.sfdisk b/configs/elfDesktop.sfdisk similarity index 100% rename from elfDesktop.sfdisk rename to configs/elfDesktop.sfdisk diff --git a/elfLaptop.sfdisk b/configs/elfLaptop.sfdisk similarity index 100% rename from elfLaptop.sfdisk rename to configs/elfLaptop.sfdisk diff --git a/configs/sshConfig b/configs/sshConfig index 74a8d26..0ee26c2 100644 --- a/configs/sshConfig +++ b/configs/sshConfig @@ -2,10 +2,8 @@ Host broodje.freenen.nl Port 1675 Host home.freenen.nl Port 2653 -Host git.finnvanreenen.nl - Port 1234 - IdentityFile ~/.ssh/id_rsa - IdentitiesOnly yes +Host gitea.finnvanreenen.nl + Port 22 host * Port 22 diff --git a/elfDesktop.sh b/elfDesktop.sh index 8ae6002..221ab8f 100644 --- a/elfDesktop.sh +++ b/elfDesktop.sh @@ -4,7 +4,7 @@ UEFI_DISK="/dev/nvme0n1" DISK="/dev/nvme0n1" USERNAME="freenen" -SFDISK_FILE="./elfDesktop.sfdisk" +SFDISK_FILE="./configs/elfDesktop.sfdisk" UEFI_PARTITION="${UEFI_DISK}p1" SWAP_PARTITION="${DISK}p2" ROOT_PARTITION="${DISK}p3" diff --git a/elfLaptop.sh b/elfLaptop.sh index f413703..2835723 100644 --- a/elfLaptop.sh +++ b/elfLaptop.sh @@ -4,7 +4,7 @@ UEFI_DISK="/dev/sdb" DISK="/dev/sdb" USERNAME="freenen" -SFDISK_FILE="./elfLaptop.sfdisk" +SFDISK_FILE="./configs/elfLaptop.sfdisk" UEFI_PARTITION="${UEFI_DISK}1" SWAP_PARTITION="${DISK}2" ROOT_PARTITION="${DISK}3" diff --git a/elf_os.sh b/elf_os.sh index f7cdb02..17fcd67 100755 --- a/elf_os.sh +++ b/elf_os.sh @@ -78,10 +78,10 @@ rm keyfile.luks run "format root partition" "mkfs.btrfs /dev/mapper/cryptelfroot" run "mount root partition" "mount /dev/mapper/cryptelfroot /mnt" -run "create root btrfs subvolume" "btrfs subvolume create /mnt/@" +run "create root btrfs subvolume" "btrfs subvolume create /mnt/@elfRoot" run "create home btrfs subvolume" "btrfs subvolume create /mnt/@home" run "unmount btrfs" "umount /mnt" -run "mount root subvolume" "mount -o subvol=@ /dev/mapper/cryptelfroot /mnt" +run "mount root subvolume" "mount -o subvol=@elfRoot /dev/mapper/cryptelfroot /mnt" run "mount boot partition" "mount --mkdir ${UEFI_PARTITION} /mnt/boot" run "mount home subvolume" "mount --mkdir -o subvol=@home /dev/mapper/cryptelfroot /mnt/home" run "enable swap" "swapon ${SWAP_PARTITION}" @@ -125,14 +125,14 @@ run-chroot "create boot config for main" "cat >/boot/loader/entries/arch.conf << title E.L.F. OS linux /vmlinuz-linux initrd /initramfs-linux.img -options cryptdevice=UUID=$DISKUUID:cryptelfroot:allow-discards root=/dev/mapper/cryptelfroot rootflags=subvol=@ rd.luks.options=discard rw +options cryptdevice=UUID=$DISKUUID:cryptelfroot:allow-discards root=/dev/mapper/cryptelfroot rootflags=subvol=@elfRoot rd.luks.options=discard rw EOF " run-chroot "create boot config fallback" "cat >/boot/loader/entries/arch-fallback.conf </boot/loader/loader.conf <