From a2b7849bebe24154067e880375b997e11fe68e45 Mon Sep 17 00:00:00 2001 From: Markus Ofterdinger Date: Thu, 30 Dec 2021 18:07:11 +0100 Subject: [PATCH 1/6] cryptsetup --- archlinux/install_zbook.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/archlinux/install_zbook.sh b/archlinux/install_zbook.sh index 6884ad2..d98ce02 100644 --- a/archlinux/install_zbook.sh +++ b/archlinux/install_zbook.sh @@ -4,6 +4,8 @@ set -x ############################# # variables ############################# +CONTAINER=cryptlvm +CONT_VOL=/dev/mapper/$CONTAINER PHY_VOL=/dev/sda2 VOL_GRP=vg1 HOSTNAME="archlinux-zbook" @@ -48,16 +50,19 @@ y modprobe dm_mod +cryptsetup luksFormat $PHY_VOL +cryptsetup open $PHY_VOL $CONTAINER + ######################### # create physical volume ######################### -pvcreate $PHY_VOL +pvcreate $CONT_VOL pvdisplay ###################### # create volume group ###################### -vgcreate $VOL_GRP $PHY_VOL +vgcreate $VOL_GRP $CONT_VOL vgdisplay ######################### @@ -153,6 +158,7 @@ auto-firmware 1" > /mnt/boot/loader/loader.conf # 2. mkinitcpio.conf: # MODULES=(i915 intel_agp) # HOOKS=(base systemd autodetect modconf block sd-vconsole lvm2 filesystems keyboard fsck) +# HOOKS=(base systemd autodetect keyboard sd-vconsole modconf block sd-encrypt lvm2 filesystems fsck) ##################################### nano /mnt/etc/fstab nano /mnt/etc/mkinitcpio.conf From dcd0d7c9b303166dd9b0c3f93c83bb03ac0bce87 Mon Sep 17 00:00:00 2001 From: Markus Ofterdinger Date: Thu, 30 Dec 2021 18:12:21 +0100 Subject: [PATCH 2/6] Update install_zbook.sh --- archlinux/install_zbook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/archlinux/install_zbook.sh b/archlinux/install_zbook.sh index d98ce02..4901bf0 100644 --- a/archlinux/install_zbook.sh +++ b/archlinux/install_zbook.sh @@ -100,7 +100,7 @@ echo $HOSTNAME > /mnt/etc/hostname echo LANG=en_US.UTF-8 > /mnt/etc/locale.conf echo KEYMAP=$KEYMAP > /mnt/etc/vconsole.conf -echo FONT=lat9w-16 >> /mnt/etc/vconsole.conf +#echo FONT=lat9w-16 >> /mnt/etc/vconsole.conf ##################################### # enable locales in locale.gen From 0c1979ca91121a1713f380e1c5c5e93ba29e5dfb Mon Sep 17 00:00:00 2001 From: Markus Ofterdinger Date: Thu, 30 Dec 2021 18:57:58 +0100 Subject: [PATCH 3/6] Update install_zbook.sh --- archlinux/install_zbook.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/archlinux/install_zbook.sh b/archlinux/install_zbook.sh index 4901bf0..8314fe4 100644 --- a/archlinux/install_zbook.sh +++ b/archlinux/install_zbook.sh @@ -122,28 +122,28 @@ title Arch Linux linux /vmlinuz-linux initrd /intel-ucode.img initrd /initramfs-linux.img -options root=LABEL=lv_root rw resume=LABEL=lv_swap" > /mnt/boot/loader/entries/arch.conf +options rd.luks.name==cryptlvm root=LABEL=lv_root rw resume=LABEL=lv_swap" > /mnt/boot/loader/entries/arch.conf echo "# https://systemd.io/BOOT_LOADER_SPECIFICATION/#type-1-boot-loader-specification-entries title Arch Linux LTS linux /vmlinuz-linux-lts initrd /intel-ucode.img initrd /initramfs-linux-lts.img -options root=LABEL=lv_root rw resume=LABEL=lv_swap" > /mnt/boot/loader/entries/arch-lts.conf +options rd.luks.name==cryptlvm root=LABEL=lv_root rw resume=LABEL=lv_swap" > /mnt/boot/loader/entries/arch-lts.conf echo "# https://systemd.io/BOOT_LOADER_SPECIFICATION/#type-1-boot-loader-specification-entries title Arch Linux Fallback linux /vmlinuz-linux initrd /intel-ucode.img initrd /initramfs-linux-fallback.img -options root=LABEL=lv_root rw resume=LABEL=lv_swap" > /mnt/boot/loader/entries/arch-fallback.conf +options rd.luks.name==cryptlvm root=LABEL=lv_root rw resume=LABEL=lv_swap" > /mnt/boot/loader/entries/arch-fallback.conf echo "# https://systemd.io/BOOT_LOADER_SPECIFICATION/#type-1-boot-loader-specification-entries title Arch Linux LTS Fallback linux /vmlinuz-linux-lts initrd /intel-ucode.img initrd /initramfs-linux-lts-fallback.img -options root=LABEL=lv_root rw resume=LABEL=lv_swap" > /mnt/boot/loader/entries/arch-lts-fallback.conf +options rd.luks.name==cryptlvm root=LABEL=lv_root rw resume=LABEL=lv_swap" > /mnt/boot/loader/entries/arch-lts-fallback.conf echo "# https://man.archlinux.org/man/loader.conf.5#OPTIONS default arch.conf From 58d65c62294744764dd3c06de12f24a7c599c50b Mon Sep 17 00:00:00 2001 From: Markus Ofterdinger Date: Thu, 30 Dec 2021 20:04:05 +0100 Subject: [PATCH 4/6] Update install_zbook.sh --- archlinux/install_zbook.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/archlinux/install_zbook.sh b/archlinux/install_zbook.sh index 8314fe4..879e6fa 100644 --- a/archlinux/install_zbook.sh +++ b/archlinux/install_zbook.sh @@ -122,28 +122,28 @@ title Arch Linux linux /vmlinuz-linux initrd /intel-ucode.img initrd /initramfs-linux.img -options rd.luks.name==cryptlvm root=LABEL=lv_root rw resume=LABEL=lv_swap" > /mnt/boot/loader/entries/arch.conf +options rd.luks.name==$CONTAINER root=LABEL=lv_root rw resume=LABEL=lv_swap" > /mnt/boot/loader/entries/arch.conf echo "# https://systemd.io/BOOT_LOADER_SPECIFICATION/#type-1-boot-loader-specification-entries title Arch Linux LTS linux /vmlinuz-linux-lts initrd /intel-ucode.img initrd /initramfs-linux-lts.img -options rd.luks.name==cryptlvm root=LABEL=lv_root rw resume=LABEL=lv_swap" > /mnt/boot/loader/entries/arch-lts.conf +options rd.luks.name==$CONTAINER root=LABEL=lv_root rw resume=LABEL=lv_swap" > /mnt/boot/loader/entries/arch-lts.conf echo "# https://systemd.io/BOOT_LOADER_SPECIFICATION/#type-1-boot-loader-specification-entries title Arch Linux Fallback linux /vmlinuz-linux initrd /intel-ucode.img initrd /initramfs-linux-fallback.img -options rd.luks.name==cryptlvm root=LABEL=lv_root rw resume=LABEL=lv_swap" > /mnt/boot/loader/entries/arch-fallback.conf +options rd.luks.name==$CONTAINER root=LABEL=lv_root rw resume=LABEL=lv_swap" > /mnt/boot/loader/entries/arch-fallback.conf echo "# https://systemd.io/BOOT_LOADER_SPECIFICATION/#type-1-boot-loader-specification-entries title Arch Linux LTS Fallback linux /vmlinuz-linux-lts initrd /intel-ucode.img initrd /initramfs-linux-lts-fallback.img -options rd.luks.name==cryptlvm root=LABEL=lv_root rw resume=LABEL=lv_swap" > /mnt/boot/loader/entries/arch-lts-fallback.conf +options rd.luks.name==$CONTAINER root=LABEL=lv_root rw resume=LABEL=lv_swap" > /mnt/boot/loader/entries/arch-lts-fallback.conf echo "# https://man.archlinux.org/man/loader.conf.5#OPTIONS default arch.conf From 7eeea4a6040e907570f76cd83fb026cc3bddccdd Mon Sep 17 00:00:00 2001 From: Markus Ofterdinger Date: Thu, 30 Dec 2021 20:13:23 +0100 Subject: [PATCH 5/6] Update install_zbook.sh --- archlinux/install_zbook.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/archlinux/install_zbook.sh b/archlinux/install_zbook.sh index 879e6fa..79599b2 100644 --- a/archlinux/install_zbook.sh +++ b/archlinux/install_zbook.sh @@ -117,33 +117,35 @@ en_US ISO-8859-1 ##################################### mkdir -p /mnt/boot/loader/entries +UUID=`blkid -s UUID -o value $PHY_VOL` + echo "# https://systemd.io/BOOT_LOADER_SPECIFICATION/#type-1-boot-loader-specification-entries title Arch Linux linux /vmlinuz-linux initrd /intel-ucode.img initrd /initramfs-linux.img -options rd.luks.name==$CONTAINER root=LABEL=lv_root rw resume=LABEL=lv_swap" > /mnt/boot/loader/entries/arch.conf +options rd.luks.name=$UUID=$CONTAINER root=LABEL=lv_root rw resume=LABEL=lv_swap" > /mnt/boot/loader/entries/arch.conf echo "# https://systemd.io/BOOT_LOADER_SPECIFICATION/#type-1-boot-loader-specification-entries title Arch Linux LTS linux /vmlinuz-linux-lts initrd /intel-ucode.img initrd /initramfs-linux-lts.img -options rd.luks.name==$CONTAINER root=LABEL=lv_root rw resume=LABEL=lv_swap" > /mnt/boot/loader/entries/arch-lts.conf +options rd.luks.name=$UUID=$CONTAINER root=LABEL=lv_root rw resume=LABEL=lv_swap" > /mnt/boot/loader/entries/arch-lts.conf echo "# https://systemd.io/BOOT_LOADER_SPECIFICATION/#type-1-boot-loader-specification-entries title Arch Linux Fallback linux /vmlinuz-linux initrd /intel-ucode.img initrd /initramfs-linux-fallback.img -options rd.luks.name==$CONTAINER root=LABEL=lv_root rw resume=LABEL=lv_swap" > /mnt/boot/loader/entries/arch-fallback.conf +options rd.luks.name=$UUID=$CONTAINER root=LABEL=lv_root rw resume=LABEL=lv_swap" > /mnt/boot/loader/entries/arch-fallback.conf echo "# https://systemd.io/BOOT_LOADER_SPECIFICATION/#type-1-boot-loader-specification-entries title Arch Linux LTS Fallback linux /vmlinuz-linux-lts initrd /intel-ucode.img initrd /initramfs-linux-lts-fallback.img -options rd.luks.name==$CONTAINER root=LABEL=lv_root rw resume=LABEL=lv_swap" > /mnt/boot/loader/entries/arch-lts-fallback.conf +options rd.luks.name=$UUID=$CONTAINER root=LABEL=lv_root rw resume=LABEL=lv_swap" > /mnt/boot/loader/entries/arch-lts-fallback.conf echo "# https://man.archlinux.org/man/loader.conf.5#OPTIONS default arch.conf From 85652bd4fc13e8c887f6b2030bf5359314574148 Mon Sep 17 00:00:00 2001 From: Markus Ofterdinger Date: Sat, 1 Jan 2022 18:07:24 +0100 Subject: [PATCH 6/6] Update install_zbook.sh --- archlinux/install_zbook.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/archlinux/install_zbook.sh b/archlinux/install_zbook.sh index 79599b2..cea38a7 100644 --- a/archlinux/install_zbook.sh +++ b/archlinux/install_zbook.sh @@ -98,9 +98,7 @@ genfstab -p /mnt > /mnt/etc/fstab echo $HOSTNAME > /mnt/etc/hostname echo LANG=en_US.UTF-8 > /mnt/etc/locale.conf - echo KEYMAP=$KEYMAP > /mnt/etc/vconsole.conf -#echo FONT=lat9w-16 >> /mnt/etc/vconsole.conf ##################################### # enable locales in locale.gen @@ -175,7 +173,7 @@ ln -sf /usr/share/zoneinfo/Europe/Berlin /etc/localtime hwclock --systohc --utc pacman -Sy -pacman -S --noconfirm lvm2 linux-firmware sudo intel-ucode efibootmgr +pacman -S --noconfirm lvm2 linux-firmware sudo intel-ucode mkinitcpio -P @@ -217,8 +215,5 @@ swapoff -a # Reboot into the new system, don't forget to remove the cd/usb #reboot -#pacman -S --noconfirm plasma-meta kde-applications-meta sddm sddm-kcm -#systemctl enable sddm - #pacman -S --noconfirm virtualbox-guest-utils #systemctl enable vboxservice