Mirrors/holoiso
1
0
Fork 0
mirror of https://github.com/bhaiest/holoiso.git synced 2024-11-15 07:42:48 +01:00
Code Issues Projects Releases Wiki Activity

Installer: Do not split boot from root

Browse Source
This commit is contained in:
Adam Jafarov 2022-05-30 15:19:20 +03:00 committed by GitHub
parent 7c5899e289
commit abc721ec42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
airootfs/usr/local/bin/holoinstall
View File

@ -75,31 +75,18 @@ base_os_install() {
# released after May 20.
if [ "$(awk '/'${DRIVEDEVICE}'/ {print $3; exit}' /proc/partitions)" -lt 64000000 ] || [[ "${DEVICE}" =~ mmcblk0 ]]; then
parted ${DEVICE} mkpart primary btrfs 256M 100%
else
parted ${DEVICE} mkpart primary btrfs 256M 24G
parted ${DEVICE} mkpart primary ext4 24G 100%
fi
root_partition="${INSTALLDEVICE}2"
mkfs -t vfat ${INSTALLDEVICE}1
fatlabel ${INSTALLDEVICE}1 HOLOEFI
mkfs -t btrfs -f ${root_partition}
mkfs -t ext4 ${INSTALLDEVICE}3
home_partition="${INSTALLDEVICE}3"
btrfs filesystem label ${root_partition} holo-root
CMD_MOUNT_HOME=(echo "Skipping home creation...")
CMD_MOUNT_BOOT=(echo "Skipping separate boot creation...")
else
parted ${DEVICE} mkpart primary ext4 256M 2G
parted ${DEVICE} mkpart primary btrfs 2G 24G
parted ${DEVICE} mkpart primary ext4 24G 100%
boot_partition="${INSTALLDEVICE}2"
root_partition="${INSTALLDEVICE}3"
mkfs -t vfat ${INSTALLDEVICE}1
fatlabel ${INSTALLDEVICE}1 HOLOEFI
mkfs -t btrfs -f ${root_partition}
mkfs -t ext4 boot_partition
mkfs -t ext4 ${INSTALLDEVICE}4
home_partition="${INSTALLDEVICE}4"
btrfs filesystem label ${root_partition} holo-root
e2label "${INSTALLDEVICE}4" holo-home
e2label "${INSTALLDEVICE}2" holo-bootfs
CMD_MOUNT_BOOT=(mkdir ${HOLO_INSTALL_DIR}/boot && mount -t ext4 ${boot_partition} ${HOLO_INSTALL_DIR}/boot)
CMD_MOUNT_HOME=(mount -t ext4 ${home_partition} ${HOLO_INSTALL_DIR}/home)
fi
e2label "${INSTALLDEVICE}3" holo-home
echo "\nPartitioning complete, mounting and pacstrapping..."
echo "${UCODE_INSTALL_MSG}"