root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 03:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

finish autoprepare code cleanup

Browse source
This commit is contained in:
Tobias Powalowski 2022-01-22 14:56:59 +01:00
parent 91541b7752
commit 3b69a94768
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
usr/bin/archboot-setup.sh
View file

@ -1458,7 +1458,7 @@ autoprepare() {
parted -a optimal -s "${DEVICE}" unit MiB mkpart primary $((GUID_PART_SIZE+BOOT_PART_SIZE+SWAP_PART_SIZE)) "$(sgdisk -E "${DEVICE}" | grep "^[0-9]")S" >${LOG} parted -a optimal -s "${DEVICE}" unit MiB mkpart primary $((GUID_PART_SIZE+BOOT_PART_SIZE+SWAP_PART_SIZE)) "$(sgdisk -E "${DEVICE}" | grep "^[0-9]")S" >${LOG}
else else
parted -a optimal -s "${DEVICE}" unit MiB mkpart primary $((GUID_PART_SIZE+BOOT_PART_SIZE+SWAP_PART_SIZE)) $((GUID_PART_SIZE+BOOT_PART_SIZE+SWAP_PART_SIZE+ROOT_PART_SIZE)) >${LOG} parted -a optimal -s "${DEVICE}" unit MiB mkpart primary $((GUID_PART_SIZE+BOOT_PART_SIZE+SWAP_PART_SIZE)) $((GUID_PART_SIZE+BOOT_PART_SIZE+SWAP_PART_SIZE+ROOT_PART_SIZE)) >${LOG}
parted -a optimal -s "${DEVICE}" unit MiB mkpart primary $((GUID_PART_SIZE+BOOT_PART_SIZE+SWAP_PART_SIZE+ROOT_PART_SIZE)) $(sgdisk -E ${DEVICE} | grep ^[0-9])S >${LOG} parted -a optimal -s "${DEVICE}" unit MiB mkpart primary $((GUID_PART_SIZE+BOOT_PART_SIZE+SWAP_PART_SIZE+ROOT_PART_SIZE)) "$(sgdisk -E "${DEVICE}" | grep "^[0-9]")S" >${LOG}
fi fi
fi fi
if [[ $? -gt 0 ]]; then if [[ $? -gt 0 ]]; then
@ -1467,7 +1467,7 @@ autoprepare() {
return 1 return 1
fi fi
# reread partitiontable for kernel # reread partitiontable for kernel
partprobe ${DEVICE} partprobe "${DEVICE}"
printk on printk on
## wait until /dev initialized correct devices ## wait until /dev initialized correct devices
udevadm settle udevadm settle
@ -1500,14 +1500,14 @@ autoprepare() {
## make and mount filesystems ## make and mount filesystems
for fsspec in ${FSSPECS}; do for fsspec in ${FSSPECS}; do
DOMKFS="yes" DOMKFS="yes"
PART="${DEVICE}$(echo ${fsspec} | tr -d ' ' | cut -f1 -d:)" PART="${DEVICE}$(echo "${fsspec}" | tr -d ' ' | cut -f1 -d:)"
# Add check on nvme controller: Uses /dev/nvme0n1pX name scheme # Add check on nvme controller: Uses /dev/nvme0n1pX name scheme
[[ $(echo "${DEVICE}" | grep "nvme") ]] && PART="${DEVICE}p$(echo ${fsspec} | tr -d ' ' | cut -f1 -d:)" grep -q "nvme" "${DEVICE}" && PART="${DEVICE}p$(echo "${fsspec}" | tr -d ' ' | cut -f1 -d:)"
MP="$(echo ${fsspec} | tr -d ' ' | cut -f2 -d:)" MP="$(echo "${fsspec}" | tr -d ' ' | cut -f2 -d:)"
FSTYPE="$(echo ${fsspec} | tr -d ' ' | cut -f3 -d:)" FSTYPE="$(echo "${fsspec}" | tr -d ' ' | cut -f3 -d:)"
FS_OPTIONS="$(echo ${fsspec} | tr -d ' ' | cut -f4 -d:)" FS_OPTIONS="$(echo "${fsspec}" | tr -d ' ' | cut -f4 -d:)"
[[ "${FS_OPTIONS}" == "" ]] && FS_OPTIONS="NONE" [[ "${FS_OPTIONS}" == "" ]] && FS_OPTIONS="NONE"
LABEL_NAME="$(echo ${fsspec} | tr -d ' ' | cut -f5 -d:)" LABEL_NAME="$(echo "${fsspec}" | tr -d ' ' | cut -f5 -d:)"
BTRFS_DEVICES="${PART}" BTRFS_DEVICES="${PART}"
if [[ "${FSTYPE}" = "btrfs" ]]; then if [[ "${FSTYPE}" = "btrfs" ]]; then
BTRFS_COMPRESS="compress=lzo" BTRFS_COMPRESS="compress=lzo"
@ -1525,7 +1525,7 @@ autoprepare() {
else else
DIALOG --infobox "Creating and activating swapspace on ${PART}" 0 0 DIALOG --infobox "Creating and activating swapspace on ${PART}" 0 0
fi fi
_mkfs ${DOMKFS} ${PART} ${FSTYPE} ${DESTDIR} ${MP} ${LABEL_NAME} ${FS_OPTIONS} ${BTRFS_DEVICES} ${BTRFS_LEVEL} ${BTRFS_SUBVOLUME} ${DOSUBVOLUME} ${BTRFS_COMPRESS} || return 1 _mkfs "${DOMKFS}" "${PART}" "${FSTYPE}" "${DESTDIR}" "${MP}" "${LABEL_NAME}" "${FS_OPTIONS}" "${BTRFS_DEVICES}" ${BTRFS_LEVEL} ${BTRFS_SUBVOLUME} ${DOSUBVOLUME} ${BTRFS_COMPRESS} || return 1
sleep 1 sleep 1
done done