From 1709b276b9e3312b8a7afa28f1edec4c28a40284 Mon Sep 17 00:00:00 2001 From: Xiao Pan Date: Thu, 16 Nov 2023 07:31:35 +0000 Subject: fix some issues for the new studio arch install --- etc/crypttab | 14 -------------- etc/crypttab.initramfs | 1 + etc/fstab | 7 ++----- 3 files changed, 3 insertions(+), 19 deletions(-) delete mode 100644 etc/crypttab create mode 100644 etc/crypttab.initramfs (limited to 'etc') diff --git a/etc/crypttab b/etc/crypttab deleted file mode 100644 index 8ce17a7e..00000000 --- a/etc/crypttab +++ /dev/null @@ -1,14 +0,0 @@ -# Configuration for encrypted block devices. -# See crypttab(5) for details. - -# NOTE: Do not list your root (/) partition here, it must be set up -# beforehand by the initramfs (/etc/mkinitcpio.conf). - -# -# home UUID=b8ad5c18-f445-495d-9095-c9ec4f9d2f37 /etc/mypassword1 -# data1 /dev/sda3 /etc/mypassword2 -# data2 /dev/sda5 /etc/cryptfs.key -# swap /dev/sdx4 /dev/urandom swap,cipher=aes-cbc-essiv:sha256,size=256 -# vol /dev/sdb7 none - -home UUID=20542319-35a2-4325-9df9-2ed9bd795d0f diff --git a/etc/crypttab.initramfs b/etc/crypttab.initramfs new file mode 100644 index 00000000..2e791def --- /dev/null +++ b/etc/crypttab.initramfs @@ -0,0 +1 @@ +root UUID=885f1377-38e8-4152-aa98-0adb6d88b1a2 none password-echo=no diff --git a/etc/fstab b/etc/fstab index aaad5b18..2cee5b1a 100644 --- a/etc/fstab +++ b/etc/fstab @@ -3,13 +3,10 @@ # # /dev/mapper/root -UUID=2073de6a-b615-4ba8-b71b-5433cf9cbca1 / ext4 rw,relatime 0 1 +UUID=dacfc0cd-80d7-4487-96cb-704a806d5477 / ext4 rw,relatime 0 1 # /dev/sda1 -UUID=e296d380-93d5-4e4a-a5b8-52e2bd52d26c /boot ext4 rw,relatime 0 2 - -# /dev/mapper/home -UUID=7d01dc7d-d269-4d41-a8aa-ef0ff2bf4f9c /home ext4 rw,relatime 0 2 +UUID=f1897be9-d50d-4585-a7f2-565c6c02f92c /boot ext4 rw,relatime 0 2 /swapfile none swap defaults 0 0 -- cgit v1.2.3-70-g09d2