mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-19 19:40:37 +02:00
Compare commits
No commits in common. "6175f40a883eca9af2ea39396b8844bd89fcf446" and "609302ba10dcade10015ae1925bf59165fe51a56" have entirely different histories.
6175f40a88
...
609302ba10
7 changed files with 73 additions and 82 deletions
|
@ -1,21 +1,14 @@
|
|||
On the road to 2023.07:
|
||||
- kernel 6.4.x
|
||||
- grub 2.06.r591.g6425c12cd-1
|
||||
- use BLAKE2b/b2sum instead of sha256sum
|
||||
Environment Changes:
|
||||
- renamed initramfs to initrd
|
||||
- stripped off archboot from kernel name
|
||||
- renamed Locale Mode to Offline Mode
|
||||
- removed custom grub package
|
||||
- removed uninstalled packages
|
||||
- added grub bli efi module
|
||||
locale:
|
||||
- fixed abort dialog
|
||||
update:
|
||||
- trigger kernel module loading on -full-system
|
||||
setup:
|
||||
- silence _LSBLK errors
|
||||
- added grub bli efi module to grub.cfg
|
||||
---
|
||||
2023.06 Highlights:
|
||||
- New domain https://archboot.com with new w3c conform html layout
|
||||
|
|
|
@ -42,12 +42,12 @@ _prepare_shim_files () {
|
|||
### RISC64: https://fedoraproject.org/wiki/Architectures/RISC-V/GRUB2
|
||||
_prepare_uefi_X64() {
|
||||
echo "Preparing X64 Grub..."
|
||||
grub-mkstandalone -d /usr/lib/grub/x86_64-efi -O x86_64-efi --sbat=/usr/share/grub/sbat.csv --modules="all_video bli boot btrfs cat configfile cryptodisk echo efi_gop efi_uga efifwsetup efinet ext2 f2fs fat font gcry_rijndael gcry_rsa gcry_serpent gcry_sha256 gcry_twofish gcry_whirlpool gfxmenu gfxterm gzio halt hfsplus http iso9660 loadenv loopback linux lvm lsefi lsefimmap luks luks2 mdraid09 mdraid1x minicmd net normal part_apple part_msdos part_gpt password_pbkdf2 pgp png reboot regexp search search_fs_uuid search_fs_file search_label serial sleep syslinuxcfg test tftp video xfs zstd backtrace chain tpm usb usbserial_common usbserial_pl2303 usbserial_ftdi usbserial_usbdebug keylayouts at_keyboard" --fonts="ter-u16n" --locales="" --themes="" -o grub-efi/grubx64.efi "boot/grub/grub.cfg=${_GRUB_ISO}"
|
||||
grub-mkstandalone -d /usr/lib/grub/x86_64-efi -O x86_64-efi --sbat=/usr/share/grub/sbat.csv --modules="all_video boot btrfs cat configfile cryptodisk echo efi_gop efi_uga efifwsetup efinet ext2 f2fs fat font gcry_rijndael gcry_rsa gcry_serpent gcry_sha256 gcry_twofish gcry_whirlpool gfxmenu gfxterm gzio halt hfsplus http iso9660 loadenv loopback linux lvm lsefi lsefimmap luks luks2 mdraid09 mdraid1x minicmd net normal part_apple part_msdos part_gpt password_pbkdf2 pgp png reboot regexp search search_fs_uuid search_fs_file search_label serial sleep syslinuxcfg test tftp video xfs zstd backtrace chain tpm usb usbserial_common usbserial_pl2303 usbserial_ftdi usbserial_usbdebug keylayouts at_keyboard" --fonts="ter-u16n" --locales="" --themes="" -o grub-efi/grubx64.efi "boot/grub/grub.cfg=${_GRUB_ISO}"
|
||||
}
|
||||
|
||||
_prepare_uefi_IA32() {
|
||||
echo "Preparing IA32 Grub..."
|
||||
grub-mkstandalone -d /usr/lib/grub/i386-efi -O i386-efi --sbat=/usr/share/grub/sbat.csv --modules="all_video bli boot btrfs cat configfile cryptodisk echo efi_gop efi_uga efifwsetup efinet ext2 f2fs fat font gcry_rijndael gcry_rsa gcry_serpent gcry_sha256 gcry_twofish gcry_whirlpool gfxmenu gfxterm gzio halt hfsplus http iso9660 loadenv loopback linux lvm lsefi lsefimmap luks luks2 mdraid09 mdraid1x minicmd net normal part_apple part_msdos part_gpt password_pbkdf2 pgp png reboot regexp search search_fs_uuid search_fs_file search_label serial sleep syslinuxcfg test tftp video xfs zstd backtrace chain tpm usb usbserial_common usbserial_pl2303 usbserial_ftdi usbserial_usbdebug keylayouts at_keyboard" --fonts="ter-u16n" --locales="" --themes="" -o grub-efi/grubia32.efi "boot/grub/grub.cfg=${_GRUB_ISO}"
|
||||
grub-mkstandalone -d /usr/lib/grub/i386-efi -O i386-efi --sbat=/usr/share/grub/sbat.csv --modules="all_video boot btrfs cat configfile cryptodisk echo efi_gop efi_uga efifwsetup efinet ext2 f2fs fat font gcry_rijndael gcry_rsa gcry_serpent gcry_sha256 gcry_twofish gcry_whirlpool gfxmenu gfxterm gzio halt hfsplus http iso9660 loadenv loopback linux lvm lsefi lsefimmap luks luks2 mdraid09 mdraid1x minicmd net normal part_apple part_msdos part_gpt password_pbkdf2 pgp png reboot regexp search search_fs_uuid search_fs_file search_label serial sleep syslinuxcfg test tftp video xfs zstd backtrace chain tpm usb usbserial_common usbserial_pl2303 usbserial_ftdi usbserial_usbdebug keylayouts at_keyboard" --fonts="ter-u16n" --locales="" --themes="" -o grub-efi/grubia32.efi "boot/grub/grub.cfg=${_GRUB_ISO}"
|
||||
}
|
||||
|
||||
_prepare_uefi_AA64() {
|
||||
|
@ -55,7 +55,7 @@ _prepare_uefi_AA64() {
|
|||
${_NSPAWN} "${1}" pacman -Sy grub --noconfirm
|
||||
cp ${_GRUB_ISO} "${1}"/archboot-iso-grub.cfg
|
||||
echo "Preparing AA64 Grub..."
|
||||
${_NSPAWN} "${1}" grub-mkstandalone -d /usr/lib/grub/arm64-efi -O arm64-efi --sbat=/usr/share/grub/sbat.csv --modules="all_video bli boot btrfs cat configfile cryptodisk echo efi_gop efifwsetup efinet ext2 f2fs fat font gcry_rijndael gcry_rsa gcry_serpent gcry_sha256 gcry_twofish gcry_whirlpool gfxmenu gfxterm gzio halt hfsplus http iso9660 loadenv loopback linux lvm lsefi lsefimmap luks luks2 mdraid09 mdraid1x minicmd net normal part_apple part_msdos part_gpt password_pbkdf2 pgp png reboot regexp search search_fs_uuid search_fs_file search_label serial sleep syslinuxcfg test tftp video xfs zstd chain tpm" --fonts="ter-u16n" --locales="" --themes="" -o /grubaa64.efi "boot/grub/grub.cfg=/archboot-iso-grub.cfg"
|
||||
${_NSPAWN} "${1}" grub-mkstandalone -d /usr/lib/grub/arm64-efi -O arm64-efi --sbat=/usr/share/grub/sbat.csv --modules="all_video boot btrfs cat configfile cryptodisk echo efi_gop efifwsetup efinet ext2 f2fs fat font gcry_rijndael gcry_rsa gcry_serpent gcry_sha256 gcry_twofish gcry_whirlpool gfxmenu gfxterm gzio halt hfsplus http iso9660 loadenv loopback linux lvm lsefi lsefimmap luks luks2 mdraid09 mdraid1x minicmd net normal part_apple part_msdos part_gpt password_pbkdf2 pgp png reboot regexp search search_fs_uuid search_fs_file search_label serial sleep syslinuxcfg test tftp video xfs zstd chain tpm" --fonts="ter-u16n" --locales="" --themes="" -o /grubaa64.efi "boot/grub/grub.cfg=/archboot-iso-grub.cfg"
|
||||
mv "${1}"/grubaa64.efi grub-efi/
|
||||
}
|
||||
|
||||
|
@ -64,7 +64,7 @@ _prepare_uefi_RISCV64() {
|
|||
${_NSPAWN} "${1}" pacman -Sy grub --noconfirm
|
||||
cp ${_GRUB_ISO} "${1}"/archboot-iso-grub.cfg
|
||||
echo "Preparing RISCV64 Grub..."
|
||||
${_NSPAWN} "${1}" grub-mkstandalone -d /usr/lib/grub/riscv64-efi -O riscv64-efi --sbat=/usr/share/grub/sbat.csv --compress=xz --modules="boot bli cat configfile echo f2fs fat font iso9660 linux loadenv loopback minicmd normal part_apple part_gpt part_msdos regexp search search_fs_file search_fs_uuid search_label serial sleep" --fonts="ter-u16n" --locales="" --themes="" -o /BOOTRISCV64.efi "boot/grub/grub.cfg=/archboot-iso-grub.cfg"
|
||||
${_NSPAWN} "${1}" grub-mkstandalone -d /usr/lib/grub/riscv64-efi -O riscv64-efi --sbat=/usr/share/grub/sbat.csv --compress=xz --modules="boot cat configfile echo f2fs fat font iso9660 linux loadenv loopback minicmd normal part_apple part_gpt part_msdos regexp search search_fs_file search_fs_uuid search_label serial sleep" --fonts="ter-u16n" --locales="" --themes="" -o /BOOTRISCV64.efi "boot/grub/grub.cfg=/archboot-iso-grub.cfg"
|
||||
mv "${1}"/BOOTRISCV64.efi grub-efi/
|
||||
cp grub-efi/BOOTRISCV64.efi grub-efi/grubriscv64.efi
|
||||
}
|
||||
|
|
|
@ -34,7 +34,7 @@ _autoprepare() {
|
|||
_BOOTDEV_SIZE=""
|
||||
_UEFISYSDEV_SIZE=""
|
||||
# get just the disk size in M/MiB 1024*1024
|
||||
_DISK_SIZE="$(($(${_LSBLK} SIZE -d -b "${_DISK}" 2>"${_NO_LOG}")/1048576))"
|
||||
_DISK_SIZE="$(($(${_LSBLK} SIZE -d -b "${_DISK}")/1048576))"
|
||||
if [[ -z "${_DISK_SIZE}" ]]; then
|
||||
_dialog --msgbox "ERROR: Setup cannot detect size of your device, please use normal installation routine for partitioning and mounting devices." 0 0
|
||||
return 1
|
||||
|
|
|
@ -3,27 +3,27 @@
|
|||
# created by Tobias Powalowski <tpowa@archlinux.org>
|
||||
_getfstype()
|
||||
{
|
||||
${_LSBLK} FSTYPE "${1}" 2>"${_NO_LOG}"
|
||||
${_LSBLK} FSTYPE "${1}"
|
||||
}
|
||||
|
||||
_getfsuuid()
|
||||
{
|
||||
${_LSBLK} UUID "${1}" 2>"${_NO_LOG}"
|
||||
${_LSBLK} UUID "${1}"
|
||||
}
|
||||
|
||||
_getfslabel()
|
||||
{
|
||||
${_LSBLK} LABEL "${1}" 2>"${_NO_LOG}"
|
||||
${_LSBLK} LABEL "${1}"
|
||||
}
|
||||
|
||||
_getpartuuid()
|
||||
{
|
||||
${_LSBLK} PARTUUID "${1}" 2>"${_NO_LOG}"
|
||||
${_LSBLK} PARTUUID "${1}"
|
||||
}
|
||||
|
||||
_getpartlabel()
|
||||
{
|
||||
${_LSBLK} PARTLABEL "${1}" 2>"${_NO_LOG}"
|
||||
${_LSBLK} PARTLABEL "${1}"
|
||||
}
|
||||
|
||||
# lists linux blockdevices
|
||||
|
@ -32,16 +32,16 @@ _blockdevices() {
|
|||
for dev in $(${_LSBLK} NAME,TYPE | grep "disk$" | cut -d' ' -f1); do
|
||||
# exclude checks:
|
||||
#- iso9660 devices
|
||||
# (${_LSBLK} FSTYPE ${dev} 2>"${_NO_LOG}" | grep "iso9660"
|
||||
# (${_LSBLK} FSTYPE ${dev} | grep "iso9660"
|
||||
#- fakeraid isw devices
|
||||
# ${_LSBLK} FSTYPE ${dev} 2>"${_NO_LOG}" | grep "isw_raid_member"
|
||||
# ${_LSBLK} FSTYPE ${dev} | grep "isw_raid_member"
|
||||
#- fakeraid ddf devices
|
||||
# ${_LSBLK} FSTYPE ${dev} 2>"${_NO_LOG}" | grep "ddf_raid_member"
|
||||
# ${_LSBLK} FSTYPE ${dev} | grep "ddf_raid_member"
|
||||
# - zram devices
|
||||
# echo "${dev}" | grep -q 'zram'
|
||||
if ! ${_LSBLK} FSTYPE "${dev}" 2>"${_NO_LOG}" | grep -q "iso9660" &&\
|
||||
! ${_LSBLK} FSTYPE "${dev}" 2>"${_NO_LOG}" | grep -q "isw_raid_member" &&\
|
||||
! ${_LSBLK} FSTYPE "${dev}" 2>"${_NO_LOG}" | grep -q "ddf_raid_member" &&\
|
||||
if ! ${_LSBLK} FSTYPE "${dev}" | grep -q "iso9660" &&\
|
||||
! ${_LSBLK} FSTYPE "${dev}" | grep -q "isw_raid_member" &&\
|
||||
! ${_LSBLK} FSTYPE "${dev}" | grep -q "ddf_raid_member" &&\
|
||||
! echo "${dev}" | grep -q 'zram'; then
|
||||
${_LSBLK} NAME,SIZE -d "${dev}"
|
||||
fi
|
||||
|
@ -56,11 +56,11 @@ _blockdevices_partitions() {
|
|||
for dev in $(${_LSBLK} NAME,TYPE | grep -v '^/dev/md' | grep "part$"| cut -d' ' -f1); do
|
||||
# exclude checks:
|
||||
#- part of raid device
|
||||
# ${_LSBLK} FSTYPE ${dev} 2>"${_NO_LOG}" | grep "linux_raid_member"
|
||||
# ${_LSBLK} FSTYPE ${dev} | grep "linux_raid_member"
|
||||
#- part of lvm2 device
|
||||
# ${_LSBLK} FSTYPE /dev/${dev} 2>"${_NO_LOG}" | grep "LVM2_member"
|
||||
# ${_LSBLK} FSTYPE /dev/${dev} | grep "LVM2_member"
|
||||
#- part of luks device
|
||||
# ${_LSBLK} FSTYPE /dev/${dev} 2>"${_NO_LOG}" | grep "crypto_LUKS"
|
||||
# ${_LSBLK} FSTYPE /dev/${dev} | grep "crypto_LUKS"
|
||||
#- extended partition
|
||||
# sfdisk -l 2>"${_NO_LOG}" | grep "${dev}" | grep "Extended$"
|
||||
# - extended partition (LBA)
|
||||
|
@ -69,10 +69,10 @@ _blockdevices_partitions() {
|
|||
# sfdisk -l 2>"${_NO_LOG}" | grep "${dev}" | grep -q "BIOS boot$"
|
||||
#- iso9660 devices
|
||||
# "${_LSBLK} FSTYPE -s ${dev} | grep "iso9660"
|
||||
if ! ${_LSBLK} FSTYPE "${dev}" 2>"${_NO_LOG}" | grep -q "linux_raid_member" &&\
|
||||
! ${_LSBLK} FSTYPE "${dev}" 2>"${_NO_LOG}" | grep -q "LVM2_member" &&\
|
||||
! ${_LSBLK} FSTYPE "${dev}" 2>"${_NO_LOG}" | grep -q "crypto_LUKS" &&\
|
||||
! ${_LSBLK} FSTYPE -s "${dev}" 2>"${_NO_LOG}" | grep -q "iso9660" &&\
|
||||
if ! ${_LSBLK} FSTYPE "${dev}" | grep -q "linux_raid_member" &&\
|
||||
! ${_LSBLK} FSTYPE "${dev}" | grep -q "LVM2_member" &&\
|
||||
! ${_LSBLK} FSTYPE "${dev}" | grep -q "crypto_LUKS" &&\
|
||||
! ${_LSBLK} FSTYPE -s "${dev}" | grep -q "iso9660" &&\
|
||||
! sfdisk -l 2>"${_NO_LOG}" | grep "${dev}" | grep -q "Extended$" &&\
|
||||
! sfdisk -l 2>"${_NO_LOG}" | grep "${dev}" | grep -q "(LBA)$" &&\
|
||||
! sfdisk -l 2>"${_NO_LOG}" | grep "${dev}" | grep -q "BIOS boot$"; then
|
||||
|
@ -87,17 +87,17 @@ _raid_devices() {
|
|||
for dev in $(${_LSBLK} NAME,TYPE | grep " raid.*$\| linear$" | cut -d' ' -f 1 | sort -u); do
|
||||
# exclude checks:
|
||||
# - part of lvm2 device_found
|
||||
# ${_LSBLK} FSTYPE ${dev} 2>"${_NO_LOG}" | grep "LVM2_member"
|
||||
# ${_LSBLK} FSTYPE ${dev} | grep "LVM2_member"
|
||||
# - part of luks device
|
||||
# ${_LSBLK} FSTYPE ${dev} 2>"${_NO_LOG}" | grep "crypto_LUKS"
|
||||
# ${_LSBLK} FSTYPE ${dev} | grep "crypto_LUKS"
|
||||
# - part of isw fakeraid
|
||||
# ${_LSBLK} FSTYPE ${dev} -s 2>"${_NO_LOG}" | grep "isw_raid_member"
|
||||
# ${_LSBLK} FSTYPE ${dev} -s | grep "isw_raid_member"
|
||||
# - part of ddf fakeraid
|
||||
# ${_LSBLK} FSTYPE ${dev} -s 2>"${_NO_LOG}" | grep "ddf_raid_member"
|
||||
if ! ${_LSBLK} FSTYPE "${dev}" 2>"${_NO_LOG}" | grep -q "LVM2_member" &&\
|
||||
! ${_LSBLK} FSTYPE "${dev}" 2>"${_NO_LOG}" | grep -q "crypto_LUKS" &&\
|
||||
! ${_LSBLK} FSTYPE "${dev}" -s 2>"${_NO_LOG}" | grep -q "isw_raid_member" &&\
|
||||
! ${_LSBLK} FSTYPE "${dev}" -s 2>"${_NO_LOG}" | grep -q "ddf_raid_member" &&\
|
||||
# ${_LSBLK} FSTYPE ${dev} -s | grep "ddf_raid_member"
|
||||
if ! ${_LSBLK} FSTYPE "${dev}" | grep -q "LVM2_member" &&\
|
||||
! ${_LSBLK} FSTYPE "${dev}" | grep -q "crypto_LUKS" &&\
|
||||
! ${_LSBLK} FSTYPE "${dev}" -s | grep -q "isw_raid_member" &&\
|
||||
! ${_LSBLK} FSTYPE "${dev}" -s | grep -q "ddf_raid_member" &&\
|
||||
! find "$dev"*p* -type f -exec echo {} \; 2>"${_NO_LOG}"; then
|
||||
${_LSBLK} NAME,SIZE -d "${dev}"
|
||||
fi
|
||||
|
@ -109,23 +109,23 @@ _partitionable_raid_devices_partitions() {
|
|||
for dev in $(${_LSBLK} NAME,TYPE | grep "part$" | grep "^/dev/md.*p" 2>"${_NO_LOG}" | cut -d' ' -f 1 | sort -u) ; do
|
||||
# exclude checks:
|
||||
# - part of lvm2 device_found
|
||||
# ${_LSBLK} FSTYPE ${dev} 2>"${_NO_LOG}" | grep "LVM2_member"
|
||||
# ${_LSBLK} FSTYPE ${dev} | grep "LVM2_member"
|
||||
# - part of luks device
|
||||
# ${_LSBLK} FSTYPE ${dev} 2>"${_NO_LOG}" | grep "crypto_LUKS"
|
||||
# ${_LSBLK} FSTYPE ${dev} | grep "crypto_LUKS"
|
||||
# - extended partition
|
||||
# sfdisk -l 2>"${_NO_LOG}" 2>"${_NO_LOG}" | grep "${dev}" | grep "Extended$"
|
||||
# sfdisk -l 2>"${_NO_LOG}" | grep "${dev}" | grep "Extended$"
|
||||
# - extended partition (LBA)
|
||||
# sfdisk -l 2>"${_NO_LOG}" 2>"${_NO_LOG}" | grep "${dev}" | grep "(LBA)$"
|
||||
# sfdisk -l 2>"${_NO_LOG}" | grep "${dev}" | grep "(LBA)$"
|
||||
# - part of isw fakeraid
|
||||
# ${_LSBLK} FSTYPE ${dev} -s 2>"${_NO_LOG}" | grep "isw_raid_member"
|
||||
# ${_LSBLK} FSTYPE ${dev} -s | grep "isw_raid_member"
|
||||
# - part of ddf fakeraid
|
||||
# ${_LSBLK} FSTYPE ${dev} -s 2>"${_NO_LOG}" | grep "ddf_raid_member"
|
||||
if ! ${_LSBLK} FSTYPE "${dev}" 2>"${_NO_LOG}" | grep -q "LVM2_member" &&\
|
||||
! ${_LSBLK} FSTYPE "${dev}" 2>"${_NO_LOG}" | grep -q "crypto_LUKS" &&\
|
||||
# ${_LSBLK} FSTYPE ${dev} -s | grep "ddf_raid_member"
|
||||
if ! ${_LSBLK} FSTYPE "${dev}" | grep -q "LVM2_member" &&\
|
||||
! ${_LSBLK} FSTYPE "${dev}" | grep -q "crypto_LUKS" &&\
|
||||
! sfdisk -l 2>"${_NO_LOG}" | grep "${dev}" | grep -q "Extended$" &&\
|
||||
! sfdisk -l 2>"${_NO_LOG}" | grep "${dev}" | grep -q "(LBA)$" &&\
|
||||
! ${_LSBLK} FSTYPE "${dev}" -s 2>"${_NO_LOG}" | grep -q "isw_raid_member" &&\
|
||||
! ${_LSBLK} FSTYPE "${dev}" -s 2>"${_NO_LOG}" | grep -q "ddf_raid_member"; then
|
||||
! ${_LSBLK} FSTYPE "${dev}" -s | grep -q "isw_raid_member" &&\
|
||||
! ${_LSBLK} FSTYPE "${dev}" -s | grep -q "ddf_raid_member"; then
|
||||
${_LSBLK} NAME,SIZE -d "${dev}"
|
||||
fi
|
||||
done
|
||||
|
@ -133,14 +133,14 @@ _partitionable_raid_devices_partitions() {
|
|||
|
||||
_dmraid_devices() {
|
||||
# isw_raid_member, managed by mdadm
|
||||
for dev in $(${_LSBLK} NAME,TYPE | grep " raid.*$" | cut -d' ' -f 1 | sort -u); do
|
||||
if ${_LSBLK} NAME,FSTYPE -s "${dev}" 2>"${_NO_LOG}" | grep -q "isw_raid_member$"; then
|
||||
for dev in $(${_LSBLK} NAME,TYPE 2>"${_NO_LOG}" | grep " raid.*$" | cut -d' ' -f 1 | sort -u); do
|
||||
if ${_LSBLK} NAME,FSTYPE -s "${dev}" | grep -q "isw_raid_member$"; then
|
||||
${_LSBLK} NAME,SIZE -d "${dev}"
|
||||
fi
|
||||
done
|
||||
# ddf_raid_member, managed by mdadm
|
||||
for dev in $(${_LSBLK} NAME,TYPE | grep " raid.*$" | cut -d' ' -f 1 | sort -u); do
|
||||
if ${_LSBLK} NAME,FSTYPE -s "${dev}" 2>"${_NO_LOG}" | grep -q "ddf_raid_member$"; then
|
||||
for dev in $(${_LSBLK} NAME,TYPE 2>"${_NO_LOG}" | grep " raid.*$" | cut -d' ' -f 1 | sort -u); do
|
||||
if ${_LSBLK} NAME,FSTYPE -s "${dev}" | grep -q "ddf_raid_member$"; then
|
||||
${_LSBLK} NAME,SIZE -d "${dev}"
|
||||
fi
|
||||
done
|
||||
|
@ -168,17 +168,17 @@ _dm_devices() {
|
|||
for dev in $(${_LSBLK} NAME,TYPE | grep -e "lvm$" -e "crypt$" | cut -d' ' -f1 | sort -u); do
|
||||
# exclude checks:
|
||||
# - part of lvm2 device
|
||||
# ${_LSBLK} FSTYPE ${dev} 2>"${_NO_LOG}" | grep "LVM2_member"
|
||||
# ${_LSBLK} FSTYPE ${dev} | grep "LVM2_member"
|
||||
# - part of luks device
|
||||
# ${_LSBLK} FSTYPE ${dev} 2>"${_NO_LOG}" | grep "crypto_LUKS"
|
||||
# ${_LSBLK} FSTYPE ${dev} | grep "crypto_LUKS"
|
||||
# - part of raid device
|
||||
# ${_LSBLK} FSTYPE ${dev} 2>"${_NO_LOG}" | grep "linux_raid_member$"
|
||||
# ${_LSBLK} FSTYPE ${dev} | grep "linux_raid_member$"
|
||||
# - part of running raid on encrypted device
|
||||
# ${_LSBLK} TYPE ${dev} 2>"${_NO_LOG}" | grep "raid.*$
|
||||
if ! ${_LSBLK} FSTYPE "${dev}" 2>"${_NO_LOG}" | grep -q "crypto_LUKS$" &&\
|
||||
! ${_LSBLK} FSTYPE "${dev}" 2>"${_NO_LOG}" | grep -q "LVM2_member$" &&\
|
||||
! ${_LSBLK} FSTYPE "${dev}" 2>"${_NO_LOG}" | grep -q "linux_raid_member$" &&\
|
||||
! ${_LSBLK} TYPE "${dev}" 2>"${_NO_LOG}" | grep -q "raid.*$"; then
|
||||
# ${_LSBLK} TYPE ${dev} | grep "raid.*$
|
||||
if ! ${_LSBLK} FSTYPE "${dev}" | grep -q "crypto_LUKS$" &&\
|
||||
! ${_LSBLK} FSTYPE "${dev}" | grep -q "LVM2_member$" &&\
|
||||
! ${_LSBLK} FSTYPE "${dev}" | grep -q "linux_raid_member$" &&\
|
||||
! ${_LSBLK} TYPE "${dev}" | grep -q "raid.*$"; then
|
||||
${_LSBLK} NAME,SIZE -d "${dev}"
|
||||
fi
|
||||
done
|
||||
|
@ -239,7 +239,7 @@ _activate_luks()
|
|||
if ${_LSBLK} FSTYPE | grep -q "crypto_LUKS"; then
|
||||
for part in $(${_LSBLK} NAME,FSTYPE | grep " crypto_LUKS$" | cut -d' ' -f 1); do
|
||||
# skip already encrypted devices, device mapper!
|
||||
if ! ${_LSBLK} TYPE "${part}" 2>"${_NO_LOG}" | grep -q "crypt$"; then
|
||||
if ! ${_LSBLK} TYPE "${part}" | grep -q "crypt$"; then
|
||||
_RUN_LUKS=""
|
||||
_dialog --yesno "Setup detected luks encrypted device, do you want to activate ${part} ?" 0 0 && _RUN_LUKS=1
|
||||
[[ -n "${_RUN_LUKS}" ]] && _enter_luks_name && _enter_luks_passphrase && _opening_luks
|
||||
|
@ -379,7 +379,7 @@ _stopluks()
|
|||
if [[ -n "${_DISABLELUKS}" ]]; then
|
||||
_umountall
|
||||
for dev in ${_LUKSDEV}; do
|
||||
_LUKS_REAL_DEV="$(${_LSBLK} NAME,FSTYPE -s "${_LUKSDEV}" 2>"${_NO_LOG}" | grep " crypto_LUKS$" | cut -d' ' -f1)"
|
||||
_LUKS_REAL_DEV="$(${_LSBLK} NAME,FSTYPE -s "${_LUKSDEV}" | grep " crypto_LUKS$" | cut -d' ' -f1)"
|
||||
cryptsetup remove "${dev}" >"${_LOG}"
|
||||
# delete header from device
|
||||
wipefs -a "${_LUKS_REAL_DEV}" &>"${_NO_LOG}"
|
||||
|
@ -425,7 +425,7 @@ _createmd()
|
|||
_DEVS="$(_finddevices)"
|
||||
if [[ -n "${_RAID_BLACKLIST}" ]]; then
|
||||
for dev in ${_RAID_BLACKLIST}; do
|
||||
_DEVS="${_DEVS//$(${_LSBLK} NAME,SIZE -d "${dev}" 2>"${_NO_LOG}")/}"
|
||||
_DEVS="${_DEVS//$(${_LSBLK} NAME,SIZE -d "${dev}")/}"
|
||||
done
|
||||
fi
|
||||
# break if all devices are in use
|
||||
|
@ -464,7 +464,7 @@ _createmd()
|
|||
while [[ "${_DEV}" != "DONE" ]]; do
|
||||
_RAIDNUMBER=$((_RAIDNUMBER + 1))
|
||||
# clean loop from used partition and options
|
||||
_DEVS="$(echo "${_DEVS}" | sed -e "s#$(${_LSBLK} NAME,SIZE -d "${_DEV}" 2>"${_NO_LOG}")##g" -e 's#MISSING\ _##g' -e 's#SPARE\ _##g')"
|
||||
_DEVS="$(echo "${_DEVS}" | sed -e "s#$(${_LSBLK} NAME,SIZE -d "${_DEV}")##g" -e 's#MISSING\ _##g' -e 's#SPARE\ _##g')"
|
||||
# raid0 doesn't support missing devices
|
||||
! [[ "${_LEVEL}" == "raid0" || "${_LEVEL}" == "linear" ]] && _MDEXTRA="MISSING _"
|
||||
# add more devices
|
||||
|
@ -545,7 +545,7 @@ _createpv()
|
|||
_DEVS="$(_finddevices)"
|
||||
if [[ -n "${_LVM_BLACKLIST}" ]]; then
|
||||
for dev in ${_LVM_BLACKLIST}; do
|
||||
_DEVS="${_DEVS//$(${_LSBLK} NAME,SIZE -d "${dev}" 2>"${_NO_LOG}")/}"
|
||||
_DEVS="${_DEVS//$(${_LSBLK} NAME,SIZE -d "${dev}")/}"
|
||||
done
|
||||
fi
|
||||
# break if all devices are in use
|
||||
|
@ -562,7 +562,7 @@ _createpv()
|
|||
while [[ "${_DEV}" != "DONE" ]]; do
|
||||
_DEVNUMBER="$((_DEVNUMBER + 1))"
|
||||
# clean loop from used partition and options
|
||||
_DEVS="${_DEVS//$(${_LSBLK} NAME,SIZE -d "${_DEV}") 2>"${_NO_LOG}"/}"
|
||||
_DEVS="${_DEVS//$(${_LSBLK} NAME,SIZE -d "${_DEV}")/}"
|
||||
# add more devices
|
||||
#shellcheck disable=SC2086
|
||||
_dialog --menu "Select additional device number ${_DEVNUMBER} for physical volume:" 15 60 12 ${_DEVS} DONE _ 2>"${_ANSWER}" || return 1
|
||||
|
@ -594,10 +594,10 @@ _findpv()
|
|||
for dev in $(${_LSBLK} NAME,FSTYPE | grep " LVM2_member$" | cut -d' ' -f1 | sort -u); do
|
||||
# exclude checks:
|
||||
#- not part of running lvm2
|
||||
# ! "$(${_LSBLK} TYPE ${dev} 2>"${_NO_LOG}" | grep "lvm")"
|
||||
# ! "$(${_LSBLK} TYPE ${dev} | grep "lvm")"
|
||||
#- not part of volume group
|
||||
# $(pvs -o vg_name --noheading ${dev} | grep " $")
|
||||
if ! ${_LSBLK} TYPE "${dev}" 2>"${_NO_LOG}" | grep "lvm" && pvs -o vg_name --noheading "${dev}" | grep -q " $"; then
|
||||
if ! ${_LSBLK} TYPE "${dev}" | grep "lvm" && pvs -o vg_name --noheading "${dev}" | grep -q " $"; then
|
||||
${_LSBLK} NAME,SIZE "${dev}"
|
||||
fi
|
||||
done
|
||||
|
@ -647,7 +647,7 @@ _createvg()
|
|||
_PVNUMBER=$((_PVNUMBER + 1))
|
||||
# clean loop from used partition and options
|
||||
#shellcheck disable=SC2001,SC2086
|
||||
_PVS="${_PVS//$(${_LSBLK} NAME,SIZE -d "${_PV}") 2>"${_NO_LOG}"/}"
|
||||
_PVS="${_PVS//$(${_LSBLK} NAME,SIZE -d "${_PV}")/}"
|
||||
# add more devices
|
||||
#shellcheck disable=SC2086
|
||||
_dialog --menu "Select additional Physical Volume ${_PVNUMBER} for ${_VGDEV}:" 13 50 10 ${_PVS} DONE _ 2>"${_ANSWER}" || return 1
|
||||
|
@ -812,7 +812,7 @@ _createluks()
|
|||
_DEVS="$(_finddevices)"
|
||||
if [[ -n "${_LUKS_BLACKLIST}" ]]; then
|
||||
for dev in ${_LUKS_BLACKLIST}; do
|
||||
_DEVS="${_DEVS//$(${_LSBLK} NAME,SIZE -d "${dev}" 2>"${_NO_LOG}")/}"
|
||||
_DEVS="${_DEVS//$(${_LSBLK} NAME,SIZE -d "${dev}")/}"
|
||||
done
|
||||
fi
|
||||
# break if all devices are in use
|
||||
|
|
|
@ -35,9 +35,9 @@ _getcryptsetup() {
|
|||
if ! cryptsetup status "$(basename "${_ROOTDEV}")" | grep -q inactive; then
|
||||
if cryptsetup status "$(basename "${_ROOTDEV}")" 2>"${_NO_LOG}"; then
|
||||
if [[ "${_NAME_SCHEME_PARAMETER}" == "FSUUID" ]]; then
|
||||
_LUKSDEV="UUID=$(${_LSBLK} UUID "$(cryptsetup status "$(basename "${_ROOTDEV}")" 2>"${_NO_LOG}" | grep device: | sed -e 's#device:##g')" 2>"${_NO_LOG}")"
|
||||
_LUKSDEV="UUID=$(${_LSBLK} UUID "$(cryptsetup status "$(basename "${_ROOTDEV}")" 2>"${_NO_LOG}" | grep device: | sed -e 's#device:##g')")"
|
||||
elif [[ "${_NAME_SCHEME_PARAMETER}" == "FSLABEL" ]]; then
|
||||
_LUKSDEV="LABEL=$(${_LSBLK} LABEL "$(cryptsetup status "$(basename "${_ROOTDEV}")" 2>"${_NO_LOG}" | grep device: | sed -e 's#device:##g')" 2>"${_NO_LOG}")"
|
||||
_LUKSDEV="LABEL=$(${_LSBLK} LABEL "$(cryptsetup status "$(basename "${_ROOTDEV}")" 2>"${_NO_LOG}" | grep device: | sed -e 's#device:##g')")"
|
||||
else
|
||||
_LUKSDEV="$(cryptsetup status "$(basename "${_ROOTDEV}")" 2>"${_NO_LOG}" | grep device: | sed -e 's#device:##g'))"
|
||||
fi
|
||||
|
@ -130,14 +130,14 @@ _abort_uboot(){
|
|||
}
|
||||
|
||||
_abort_nilfs_bootpart() {
|
||||
if ${_LSBLK} FSTYPE "${_BOOTDEV}" 2>"${_NO_LOG}" | grep -q "nilfs2"; then
|
||||
if ${_LSBLK} FSTYPE "${_BOOTDEV}" | grep -q "nilfs2"; then
|
||||
_dialog --msgbox "Error:\nYour selected bootloader cannot boot from nilfs2 partition with /boot on it." 0 0
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
_abort_f2fs_bootpart() {
|
||||
if ${_LSBLK} FSTYPE "${_BOOTDEV}" 2>"${_NO_LOG}" | grep -q "f2fs"; then
|
||||
if ${_LSBLK} FSTYPE "${_BOOTDEV}" | grep -q "f2fs"; then
|
||||
_dialog --msgbox "Error:\nYour selected bootloader cannot boot from f2fs partition with /boot on it." 0 0
|
||||
return 1
|
||||
fi
|
||||
|
@ -175,7 +175,7 @@ _do_uefi_efibootmgr() {
|
|||
for _bootnum in $(efibootmgr | grep '^Boot[0-9]' | grep -F -i "${_BOOTMGR_LABEL}" | cut -b5-8) ; do
|
||||
efibootmgr --quiet -b "${_bootnum}" -B >> "${_LOG}"
|
||||
done
|
||||
_BOOTMGRDEV=$(${_LSBLK} PKNAME "${_UEFISYSDEV}" 2>"${_NO_LOG}")
|
||||
_BOOTMGRDEV=$(${_LSBLK} PKNAME "${_UEFISYSDEV}")
|
||||
_BOOTMGRNUM=$(echo "${_UEFISYSDEV}" | sed -e "s#${_BOOTMGRDEV}##g" | sed -e 's#p##g')
|
||||
efibootmgr --quiet --create --disk "${_BOOTMGRDEV}" --part "${_BOOTMGRNUM}" --loader "${_BOOTMGR_LOADER_PATH}" --label "${_BOOTMGR_LABEL}" >> "${_LOG}"
|
||||
}
|
||||
|
@ -634,7 +634,6 @@ else
|
|||
if [ "\${grub_platform}" == "efi" ]; then
|
||||
insmod efi_gop
|
||||
insmod efi_uga
|
||||
insmod bli
|
||||
fi
|
||||
if [ "\${grub_platform}" == "pc" ]; then
|
||||
insmod vbe
|
||||
|
|
|
@ -35,7 +35,7 @@ _ssd_optimization() {
|
|||
_SSD_MOUNT_OPTIONS=""
|
||||
if echo "${_FSTYPE}" | grep -Eq 'ext4|jfs|btrfs|xfs|nilfs2|f2fs'; then
|
||||
# check all underlying devices on ssd
|
||||
for i in $(${_LSBLK} NAME,TYPE "${_DEV}" -s 2>"${_NO_LOG}" | grep "disk$" | cut -d' ' -f 1); do
|
||||
for i in $(${_LSBLK} NAME,TYPE "${_DEV}" -s | grep "disk$" | cut -d' ' -f 1); do
|
||||
# check for ssd
|
||||
if [[ "$(cat /sys/block/"$(basename "${i}")"/queue/rotational)" == 0 ]]; then
|
||||
_SSD_MOUNT_OPTIONS="noatime"
|
||||
|
@ -109,7 +109,7 @@ _check_mkfs_values() {
|
|||
[[ -z "${_BTRFS_DEVS}" ]] && _BTRFS_DEVS="NONE"
|
||||
[[ -z "${_BTRFS_LEVEL}" ]] && _BTRFS_LEVEL="NONE"
|
||||
[[ -z "${_BTRFS_SUBVOLUME}" ]] && _BTRFS_SUBVOLUME="NONE"
|
||||
[[ -z "${_LABEL_NAME}" && -n "$(${_LSBLK} LABEL "${_DEV}")" ]] && _LABEL_NAME="$(${_LSBLK} LABEL "${_DEV}" 2>"${_NO_LOG}")"
|
||||
[[ -z "${_LABEL_NAME}" && -n "$(${_LSBLK} LABEL "${_DEV}")" ]] && _LABEL_NAME="$(${_LSBLK} LABEL "${_DEV}")"
|
||||
[[ -z "${_LABEL_NAME}" ]] && _LABEL_NAME="NONE"
|
||||
}
|
||||
|
||||
|
@ -124,7 +124,7 @@ _create_filesystem() {
|
|||
[[ "${_FSTYPE}" == "swap" || "${_FSTYPE}" == "vfat" ]] || _select_filesystem || return 1
|
||||
while [[ -z "${_LABEL_NAME}" ]]; do
|
||||
_dialog --inputbox "Enter the LABEL name for the device, keep it short\n(not more than 12 characters) and use no spaces or special\ncharacters." 10 65 \
|
||||
"$(${_LSBLK} LABEL "${_DEV}" 2>"${_NO_LOG}")" 2>"${_ANSWER}" || return 1
|
||||
"$(${_LSBLK} LABEL "${_DEV}")" 2>"${_ANSWER}" || return 1
|
||||
_LABEL_NAME=$(cat "${_ANSWER}")
|
||||
if grep ":${_LABEL_NAME}$" /tmp/.parts; then
|
||||
_dialog --msgbox "ERROR: You have defined 2 identical LABEL names! Please enter another name." 8 65
|
||||
|
@ -185,7 +185,7 @@ _mountpoints() {
|
|||
# clear values first!
|
||||
_clear_fs_values
|
||||
_check_btrfs_filesystem_creation
|
||||
[[ ! "${_DEV}" == "NONE" ]] && _FSTYPE="$(${_LSBLK} FSTYPE "${_DEV}" 2>"${_NO_LOG}")"
|
||||
[[ ! "${_DEV}" == "NONE" ]] && _FSTYPE="$(${_LSBLK} FSTYPE "${_DEV}")"
|
||||
if [[ -z "${_SWAP_DONE}" && "${_FSTYPE}" == "swap" ]] || [[ "${_DEV}" == "NONE" ]]; then
|
||||
_SKIP_FILESYSTEM=1
|
||||
fi
|
||||
|
@ -272,7 +272,7 @@ _mountpoints() {
|
|||
_check_mkfs_values
|
||||
echo "${_DEV}:${_FSTYPE}:${_MP}:${_DOMKFS}:${_LABEL_NAME}:${_FS_OPTIONS}:${_BTRFS_DEVS}:${_BTRFS_LEVEL}:${_BTRFS_SUBVOLUME}:${_BTRFS_COMPRESS}" >>/tmp/.parts
|
||||
# always remove swap paetition and root device
|
||||
[[ ! "${_FSTYPE}" == "btrfs" || -z "${_UEFISYSDEV_DONE}" ]] && _DEVS="${_DEVS//$(${_LSBLK} NAME,SIZE -d "${_DEV}" 2>"${_NO_LOG}")/}"
|
||||
[[ ! "${_FSTYPE}" == "btrfs" || -z "${_UEFISYSDEV_DONE}" ]] && _DEVS="${_DEVS//$(${_LSBLK} NAME,SIZE -d "${_DEV}")/}"
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
|
|
@ -3,7 +3,6 @@ rmmod tpm
|
|||
if [ ${grub_platform} == "efi" ]; then
|
||||
insmod all_video
|
||||
insmod efi_gop
|
||||
insmod bli
|
||||
if [ ${grub_cpu} == "x86_64" ]; then
|
||||
insmod efi_uga
|
||||
elif [ ${grub_cpu} == "i386" ]; then
|
||||
|
|
Loading…
Reference in a new issue