diff --git a/debian.sh b/debian.sh index 3161d96..7e23b16 100755 --- a/debian.sh +++ b/debian.sh @@ -116,10 +116,8 @@ systemMounts(){ } decryptBoot(){ - echo '#!/bin/bash' > /etc/luks - echo "printf '$DISK_PASSWORD'" >> /etc/luks - chmod +x /etc/luks - sed -i "s/luks/luks,keyscript=\/etc\/luks/" /etc/crypttab + sed -i "s/none/\/etc\/keyfile.key/" /etc/crypttab + echo "KEYFILE_PATTERN=\"/etc/*.key\"" > /etc/cryptsetup-initramfs/conf-hook } install-vscode(){ @@ -133,7 +131,6 @@ install-doom(){ add-apt-repository 'deb http://debian.drdteam.org/ stable multiverse' apt update;apt install -y zandronum doomseeker-zandronum } - install-element(){ wget -O /usr/share/keyrings/element-io-archive-keyring.gpg https://packages.element.io/debian/element-io-archive-keyring.gpg echo "deb [signed-by=/usr/share/keyrings/element-io-archive-keyring.gpg] https://packages.element.io/debian/ default main" | tee /etc/apt/sources.list.d/element-io.list @@ -257,6 +254,7 @@ bootloader() { function setup_script() { cp -f debian.sh $TARGET/usr/bin/ + cp -f keyfile $TARGET/etc/keyfile.key echo 'bash /usr/bin/debian.sh kernel-packages' >>$TARGET/setup.sh sed -i 's/most/dep/i' $TARGET/etc/initramfs-tools/initramfs.conf echo "bash /usr/bin/debian.sh bootloader $1" >>$TARGET/setup.sh @@ -440,6 +438,8 @@ initialize-disk() { echo echo "Formatting....." echo y | mkfs.btrfs /dev/mapper/root --force + dd if=/dev/urandom of=keyfile bs=1024 count=4 + printf "$DISK_PASSWORD" | cryptsetup luksAddKey ${BTRFS} keyfile } wifi() {