RomanNum3ral
/
ArchTitus
mirror of https://github.com/ChrisTitusTech/ArchTitus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #180 from khaneliman/btrfs-fix 

Btrfs fix
This commit is contained in:
Chris Titus 2022-01-21 16:46:16 -06:00 committed by GitHub
parent 6d15c1b3a5 cddc767c3d
commit 03363bb9a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
0-preinstall.sh
View File

@ -74,10 +74,23 @@ createsubvolumes () {
} }
mountallsubvol () { mountallsubvol () {
mount -o ${MOUNT_OPTIONS},subvol=@home /dev/mapper/ROOT /mnt/home mount -o ${MOUNT_OPTIONS},subvol=@home ${partition3} /mnt/home
mount -o ${MOUNT_OPTIONS},subvol=@tmp /dev/mapper/ROOT /mnt/tmp mount -o ${MOUNT_OPTIONS},subvol=@tmp ${partition3} /mnt/tmp
mount -o ${MOUNT_OPTIONS},subvol=@.snapshots /dev/mapper/ROOT /mnt/.snapshots mount -o ${MOUNT_OPTIONS},subvol=@.snapshots ${partition3} /mnt/.snapshots
mount -o ${MOUNT_OPTIONS},subvol=@var /dev/mapper/ROOT /mnt/var mount -o ${MOUNT_OPTIONS},subvol=@var ${partition3} /mnt/var
}
subvolumesetup () {
# create nonroot subvolumes
createsubvolumes
# unmount root to remount with subvolume
umount /mnt
# mount @ subvolume
mount -o ${MOUNT_OPTIONS},subvol=@ ${partition3} /mnt
# make directories home, .snapshots, var, tmp
mkdir -p /mnt/{home,var,tmp,.snapshots}
# mount subvolumes
mountallsubvol
} }
if [[ "${DISK}" =~ "nvme" ]]; then if [[ "${DISK}" =~ "nvme" ]]; then
@ -92,6 +105,7 @@ if [[ "${FS}" == "btrfs" ]]; then
mkfs.vfat -F32 -n "EFIBOOT" ${partition2} mkfs.vfat -F32 -n "EFIBOOT" ${partition2}
mkfs.btrfs -L ROOT ${partition3} -f mkfs.btrfs -L ROOT ${partition3} -f
mount -t btrfs ${partition3} /mnt mount -t btrfs ${partition3} /mnt
subvolumesetup
elif [[ "${FS}" == "ext4" ]]; then elif [[ "${FS}" == "ext4" ]]; then
mkfs.vfat -F32 -n "EFIBOOT" ${partition2} mkfs.vfat -F32 -n "EFIBOOT" ${partition2}
mkfs.ext4 -L ROOT ${partition3} mkfs.ext4 -L ROOT ${partition3}
@ -103,29 +117,14 @@ elif [[ "${FS}" == "luks" ]]; then
# open luks container and ROOT will be place holder # open luks container and ROOT will be place holder
echo -n "${LUKS_PASSWORD}" | cryptsetup open ${partition3} ROOT - echo -n "${LUKS_PASSWORD}" | cryptsetup open ${partition3} ROOT -
# now format that container # now format that container
mkfs.btrfs -L ROOT /dev/mapper/ROOT mkfs.btrfs -L ROOT ${partition3}
# create subvolumes for btrfs # create subvolumes for btrfs
mount -t btrfs /dev/mapper/ROOT /mnt mount -t btrfs ${partition3} /mnt
createsubvolumes subvolumesetup
umount /mnt
# mount @ subvolume
mount -o ${MOUNT_OPTIONS},subvol=@ /dev/mapper/ROOT /mnt
# make directories home, .snapshots, var, tmp
mkdir -p /mnt/{home,var,tmp,.snapshots}
# mount subvolumes
mountallsubvol
# store uuid of encrypted partition for grub # store uuid of encrypted partition for grub
echo ENCRYPTED_PARTITION_UUID=$(blkid -s UUID -o value ${partition3}) >> setup.conf echo ENCRYPTED_PARTITION_UUID=$(blkid -s UUID -o value ${partition3}) >> setup.conf
fi fi
# checking if user selected btrfs
if [[ ${FS} =~ "btrfs" ]]; then
ls /mnt | xargs btrfs subvolume delete
btrfs subvolume create /mnt/@
umount /mnt
mount -t btrfs -o subvol=@ -L ROOT /mnt
fi
# mount target # mount target
mkdir /mnt/boot mkdir /mnt/boot
mkdir /mnt/boot/efi mkdir /mnt/boot/efi