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

rename LOG _LOG

Browse source
This commit is contained in:
Tobias Powalowski 2023-01-07 21:29:02 +01:00
parent 091def6bba
commit 666f25927b
10 changed files with 86 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
usr/lib/archboot/installer/autoprepare.sh
View file

@ -219,21 +219,21 @@ autoprepare() {
# create fresh GPT
sgdisk --clear "${DEVICE}" &>/dev/null
# create actual partitions
sgdisk --set-alignment="2048" --new="${_GPT_BIOS_GRUB_PART_NUM}":0:+"${GPT_BIOS_GRUB_PART_SIZE}"M --typecode="${_GPT_BIOS_GRUB_PART_NUM}":EF02 --change-name="${_GPT_BIOS_GRUB_PART_NUM}":BIOS_GRUB "${DEVICE}" > "${LOG}"
sgdisk --set-alignment="2048" --new="${_UEFISYS_PART_NUM}":0:+"${UEFISYS_PART_SIZE}"M --typecode="${_UEFISYS_PART_NUM}":EF00 --change-name="${_UEFISYS_PART_NUM}":UEFI_SYSTEM "${DEVICE}" > "${LOG}"
sgdisk --set-alignment="2048" --new="${_GPT_BIOS_GRUB_PART_NUM}":0:+"${GPT_BIOS_GRUB_PART_SIZE}"M --typecode="${_GPT_BIOS_GRUB_PART_NUM}":EF02 --change-name="${_GPT_BIOS_GRUB_PART_NUM}":BIOS_GRUB "${DEVICE}" > "${_LOG}"
sgdisk --set-alignment="2048" --new="${_UEFISYS_PART_NUM}":0:+"${UEFISYS_PART_SIZE}"M --typecode="${_UEFISYS_PART_NUM}":EF00 --change-name="${_UEFISYS_PART_NUM}":UEFI_SYSTEM "${DEVICE}" > "${_LOG}"
if [[ "${_UEFISYS_BOOTPART}" == "1" ]]; then
sgdisk --attributes="${_UEFISYS_PART_NUM}":set:2 "${DEVICE}" > "${LOG}"
sgdisk --attributes="${_UEFISYS_PART_NUM}":set:2 "${DEVICE}" > "${_LOG}"
else
sgdisk --set-alignment="2048" --new="${_BOOT_PART_NUM}":0:+"${BOOT_PART_SIZE}"M --typecode="${_BOOT_PART_NUM}":8300 --attributes="${_BOOT_PART_NUM}":set:2 --change-name="${_BOOT_PART_NUM}":ARCHLINUX_BOOT "${DEVICE}" > "${LOG}"
sgdisk --set-alignment="2048" --new="${_BOOT_PART_NUM}":0:+"${BOOT_PART_SIZE}"M --typecode="${_BOOT_PART_NUM}":8300 --attributes="${_BOOT_PART_NUM}":set:2 --change-name="${_BOOT_PART_NUM}":ARCHLINUX_BOOT "${DEVICE}" > "${_LOG}"
fi
sgdisk --set-alignment="2048" --new="${_SWAP_PART_NUM}":0:+"${SWAP_PART_SIZE}"M --typecode="${_SWAP_PART_NUM}":8200 --change-name="${_SWAP_PART_NUM}":ARCHLINUX_SWAP "${DEVICE}" > "${LOG}"
sgdisk --set-alignment="2048" --new="${_SWAP_PART_NUM}":0:+"${SWAP_PART_SIZE}"M --typecode="${_SWAP_PART_NUM}":8200 --change-name="${_SWAP_PART_NUM}":ARCHLINUX_SWAP "${DEVICE}" > "${_LOG}"
if [[ "${FSTYPE}" == "btrfs" ]]; then
sgdisk --set-alignment="2048" --new="${_ROOT_PART_NUM}":0:0 --typecode="${_ROOT_PART_NUM}":8300 --change-name="${_ROOT_PART_NUM}":ARCHLINUX_ROOT "${DEVICE}" > "${LOG}"
sgdisk --set-alignment="2048" --new="${_ROOT_PART_NUM}":0:0 --typecode="${_ROOT_PART_NUM}":8300 --change-name="${_ROOT_PART_NUM}":ARCHLINUX_ROOT "${DEVICE}" > "${_LOG}"
else
sgdisk --set-alignment="2048" --new="${_ROOT_PART_NUM}":0:+"${ROOT_PART_SIZE}"M --typecode="${_ROOT_PART_NUM}":8300 --change-name="${_ROOT_PART_NUM}":ARCHLINUX_ROOT "${DEVICE}" > "${LOG}"
sgdisk --set-alignment="2048" --new="${_HOME_PART_NUM}":0:0 --typecode="${_HOME_PART_NUM}":8302 --change-name="${_HOME_PART_NUM}":ARCHLINUX_HOME "${DEVICE}" > "${LOG}"
sgdisk --set-alignment="2048" --new="${_ROOT_PART_NUM}":0:+"${ROOT_PART_SIZE}"M --typecode="${_ROOT_PART_NUM}":8300 --change-name="${_ROOT_PART_NUM}":ARCHLINUX_ROOT "${DEVICE}" > "${_LOG}"
sgdisk --set-alignment="2048" --new="${_HOME_PART_NUM}":0:0 --typecode="${_HOME_PART_NUM}":8302 --change-name="${_HOME_PART_NUM}":ARCHLINUX_HOME "${DEVICE}" > "${_LOG}"
fi
sgdisk --print "${DEVICE}" > "${LOG}"
sgdisk --print "${DEVICE}" > "${_LOG}"
else
# start at sector 1 for 4k drive compatibility and correct alignment
printk off
@ -243,20 +243,20 @@ autoprepare() {
wipefs -a "${DEVICE}" &>/dev/null
# create DOS MBR with parted
parted -a optimal -s "${DEVICE}" unit MiB mktable msdos >/dev/null 2>&1
parted -a optimal -s "${DEVICE}" unit MiB mkpart primary 1 $((GUID_PART_SIZE+BOOT_PART_SIZE)) >"${LOG}"
parted -a optimal -s "${DEVICE}" unit MiB set 1 boot on >"${LOG}"
parted -a optimal -s "${DEVICE}" unit MiB mkpart primary $((GUID_PART_SIZE+BOOT_PART_SIZE)) $((GUID_PART_SIZE+BOOT_PART_SIZE+SWAP_PART_SIZE)) >"${LOG}"
parted -a optimal -s "${DEVICE}" unit MiB mkpart primary 1 $((GUID_PART_SIZE+BOOT_PART_SIZE)) >"${_LOG}"
parted -a optimal -s "${DEVICE}" unit MiB set 1 boot on >"${_LOG}"
parted -a optimal -s "${DEVICE}" unit MiB mkpart primary $((GUID_PART_SIZE+BOOT_PART_SIZE)) $((GUID_PART_SIZE+BOOT_PART_SIZE+SWAP_PART_SIZE)) >"${_LOG}"
# $(sgdisk -E ${DEVICE}) | grep ^[0-9] as end of last partition to keep the possibilty to convert to GPT later, instead of 100%
if [[ "${FSTYPE}" == "btrfs" ]]; then
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
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)) $((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}"
fi
fi
#shellcheck disable=SC2181
if [[ $? -gt 0 ]]; then
DIALOG --msgbox "Error: Partitioning ${DEVICE} (see ${LOG} for details)." 0 0
DIALOG --msgbox "Error: Partitioning ${DEVICE} (see ${_LOG} for details)." 0 0
printk on
return 1
fi

6
usr/lib/archboot/installer/base.sh
View file

@ -10,11 +10,11 @@ else
_DESTDIR="/"
fi
if pgrep -x Xorg > /dev/null 2>&1; then
LOG="/dev/tty8"
_LOG="/dev/tty8"
else
LOG="/dev/tty7"
_LOG="/dev/tty7"
fi
VC_NUM="$(basename ${LOG} | sed -e 's#tty##g')"
VC_NUM="$(basename ${_LOG} | sed -e 's#tty##g')"
VC="VC${VC_NUM}"
# install stages
S_SRC=0 # choose mirror

52
usr/lib/archboot/installer/blockdevices.sh
View file

@ -380,15 +380,15 @@ _stopmd()
# shellcheck disable=SC2013
for i in $(grep ^md /proc/mdstat | sed -e 's# :.*##g'); do
# clear all magic strings/signatures - mdadm, lvm, partition tables etc.
wipefs -a --force "/dev/${i}" > "${LOG}" 2>&1
mdadm --manage --stop "/dev/${i}" > "${LOG}" 2>&1
wipefs -a --force "/dev/${i}" > "${_LOG}" 2>&1
mdadm --manage --stop "/dev/${i}" > "${_LOG}" 2>&1
done
DIALOG --infobox "Cleaning superblocks of all software raid devices..." 0 0
for i in $(${_LSBLK} NAME,FSTYPE | grep "linux_raid_member$" | cut -d' ' -f 1); do
# clear all magic strings/signatures - mdadm, lvm, partition tables etc.
sgdisk --zap "${i}" > "${LOG}" 2>&1
wipefs -a --force "${i}" > "${LOG}" 2>&1
dd if=/dev/zero of="${i}" bs=512 count=2048 > "${LOG}" 2>&1
sgdisk --zap "${i}" > "${_LOG}" 2>&1
wipefs -a --force "${i}" > "${_LOG}" 2>&1
dd if=/dev/zero of="${i}" bs=512 count=2048 > "${_LOG}" 2>&1
done
fi
fi
@ -400,9 +400,9 @@ _stopmd()
DIALOG --infobox "Cleaning superblocks of all software raid devices..." 0 0
for i in $(${_LSBLK} NAME,FSTYPE | grep "linux_raid_member$" | cut -d' ' -f 1); do
# clear all magic strings/signatures - mdadm, lvm, partition tables etc.
sgdisk --zap "${i}" > "${LOG}" 2>&1
wipefs -a "${i}" > "${LOG}" 2>&1
dd if=/dev/zero of="${i}" bs=512 count=2048 > "${LOG}" 2>&1
sgdisk --zap "${i}" > "${_LOG}" 2>&1
wipefs -a "${i}" > "${_LOG}" 2>&1
dd if=/dev/zero of="${i}" bs=512 count=2048 > "${_LOG}" 2>&1
done
fi
fi
@ -426,15 +426,15 @@ _stoplvm()
_umountall
DIALOG --infobox "Removing logical volumes ..." 0 0
for i in ${LV_VOLUMES}; do
lvremove -f "/dev/mapper/${i}" 2>/dev/null> "${LOG}"
lvremove -f "/dev/mapper/${i}" 2>/dev/null> "${_LOG}"
done
DIALOG --infobox "Removing logical groups ..." 0 0
for i in ${LV_GROUPS}; do
vgremove -f "${i}" 2>/dev/null > "${LOG}"
vgremove -f "${i}" 2>/dev/null > "${_LOG}"
done
DIALOG --infobox "Removing physical volumes ..." 0 0
for i in ${LV_PHYSICAL}; do
pvremove -f "${i}" 2>/dev/null > "${LOG}"
pvremove -f "${i}" 2>/dev/null > "${_LOG}"
done
fi
}
@ -456,9 +456,9 @@ _stopluks()
DIALOG --infobox "Removing luks encrypted devices ..." 0 0
for i in ${LUKSDEVICE}; do
LUKS_REAL_DEVICE="$(${_LSBLK} NAME,FSTYPE -s "${LUKSDEVICE}" | grep " crypto_LUKS$" | cut -d' ' -f1)"
cryptsetup remove "${i}" > "${LOG}"
cryptsetup remove "${i}" > "${_LOG}"
# delete header from device
wipefs -a "${LUKS_REAL_DEVICE}" > "${LOG}" 2>&1
wipefs -a "${LUKS_REAL_DEVICE}" > "${_LOG}" 2>&1
done
fi
DISABLELUKS=""
@ -472,7 +472,7 @@ _stopluks()
DIALOG --infobox "Removing not running luks encrypted devices ..." 0 0
for i in $(${_LSBLK} NAME,FSTYPE | grep "crypto_LUKS$" | cut -d' ' -f1); do
# delete header from device
wipefs -a "${i}" > "${LOG}" 2>&1
wipefs -a "${i}" > "${_LOG}" 2>&1
done
fi
[[ -e /tmp/.crypttab ]] && rm /tmp/.crypttab
@ -654,11 +654,11 @@ _createraid()
! [[ "${PARITY}" == "" ]] && RAIDOPTIONS="${RAIDOPTIONS} --layout=${PARITY}"
DIALOG --infobox "Creating ${RAIDDEVICE}..." 0 0
#shellcheck disable=SC2086
if mdadm --create ${RAIDDEVICE} ${RAIDOPTIONS} ${DEVICES} >"${LOG}" 2>&1; then
if mdadm --create ${RAIDDEVICE} ${RAIDOPTIONS} ${DEVICES} >"${_LOG}" 2>&1; then
DIALOG --infobox "${RAIDDEVICE} created successfully.\n\nContinuing in 3 seconds..." 5 50
sleep 3
else
DIALOG --msgbox "Error creating ${RAIDDEVICE} (see ${LOG} for details)." 0 0
DIALOG --msgbox "Error creating ${RAIDDEVICE} (see ${_LOG} for details)." 0 0
return 1
fi
if [[ ${RAID_PARTITION} == "1" ]]; then
@ -746,11 +746,11 @@ _createpv()
#shellcheck disable=SC2028,SC2086
_umountall
#shellcheck disable=SC2086
if pvcreate -y ${PART} >"${LOG}" 2>&1; then
if pvcreate -y ${PART} >"${_LOG}" 2>&1; then
DIALOG --infobox "Creating physical volume on ${PART} successful.\n\nContinuing in 3 seconds..." 6 75
sleep 3
else
DIALOG --msgbox "Error creating physical volume on ${PART} (see ${LOG} for details)." 0 0; return 1
DIALOG --msgbox "Error creating physical volume on ${PART} (see ${_LOG} for details)." 0 0; return 1
fi
# run udevadm to get values exported
udevadm trigger
@ -859,11 +859,11 @@ _createvg()
PV="$(echo -n "$(cat /tmp/.pvs)")"
_umountall
#shellcheck disable=SC2086
if vgcreate ${VGDEVICE} ${PV} >"${LOG}" 2>&1; then
if vgcreate ${VGDEVICE} ${PV} >"${_LOG}" 2>&1; then
DIALOG --infobox "Creating Volume Group ${VGDEVICE} successful.\n\nContinuing in 3 seconds..." 5 50
sleep 3
else
DIALOG --msgbox "Error creating Volume Group ${VGDEVICE} (see ${LOG} for details)." 0 0
DIALOG --msgbox "Error creating Volume Group ${VGDEVICE} (see ${_LOG} for details)." 0 0
return 1
fi
}
@ -933,20 +933,20 @@ _createlv()
_umountall
if [[ "${LV_ALL}" == "1" ]]; then
#shellcheck disable=SC2086
if lvcreate ${LV_EXTRA} -l +100%FREE ${LV} -n ${LVDEVICE} >"${LOG}" 2>&1; then
if lvcreate ${LV_EXTRA} -l +100%FREE ${LV} -n ${LVDEVICE} >"${_LOG}" 2>&1; then
DIALOG --infobox "Creating Logical Volume ${LVDEVICE} successful.\n\nContinuing in 3 seconds..." 5 50
sleep 3
else
DIALOG --msgbox "Error creating Logical Volume ${LVDEVICE} (see ${LOG} for details)." 0 0
DIALOG --msgbox "Error creating Logical Volume ${LVDEVICE} (see ${_LOG} for details)." 0 0
return 1
fi
else
#shellcheck disable=SC2086
if lvcreate ${LV_EXTRA} -L ${LV_SIZE} ${LV} -n ${LVDEVICE} >"${LOG}" 2>&1; then
if lvcreate ${LV_EXTRA} -L ${LV_SIZE} ${LV} -n ${LVDEVICE} >"${_LOG}" 2>&1; then
DIALOG --infobox "Creating Logical Volume ${LVDEVICE} successful.\n\nContinuing in 3 seconds..." 5 50
sleep 3
else
DIALOG --msgbox "Error creating Logical Volume ${LVDEVICE} (see ${LOG} for details)." 0 0
DIALOG --msgbox "Error creating Logical Volume ${LVDEVICE} (see ${_LOG} for details)." 0 0
return 1
fi
fi
@ -988,7 +988,7 @@ _opening_luks() {
DIALOG --infobox "Opening encrypted ${PART}..." 0 0
luksOpen_success="0"
while [[ "${luksOpen_success}" == "0" ]]; do
cryptsetup luksOpen "${PART}" "${LUKSDEVICE}" <"${LUKSPASSPHRASE}" >"${LOG}" && luksOpen_success=1
cryptsetup luksOpen "${PART}" "${LUKSDEVICE}" <"${LUKSPASSPHRASE}" >"${_LOG}" && luksOpen_success=1
if [[ "${luksOpen_success}" == "0" ]]; then
DIALOG --msgbox "Error: Passphrase didn't match, please enter again." 0 0
_enter_luks_passphrase || return 1
@ -1056,6 +1056,6 @@ _luks()
_enter_luks_passphrase || return 1
_umountall
DIALOG --infobox "Encrypting ${PART}..." 0 0
cryptsetup -q luksFormat "${PART}" <"${LUKSPASSPHRASE}" >"${LOG}"
cryptsetup -q luksFormat "${PART}" <"${LUKSPASSPHRASE}" >"${_LOG}"
_opening_luks
}

18
usr/lib/archboot/installer/bootloader.sh
View file

@ -242,7 +242,7 @@ do_secureboot_keys() {
DIALOG --inputbox "Setup keys:\nEnter a common name(CN) for your keys, eg. Your Name" 8 65 "" 2>"${_ANSWER}" || return 1
CN=$(cat "${_ANSWER}")
done
secureboot-keys.sh -name="${CN}" "${_DESTDIR}/${KEYDIR}" > "${LOG}" 2>&1 || return 1
secureboot-keys.sh -name="${CN}" "${_DESTDIR}/${KEYDIR}" > "${_LOG}" 2>&1 || return 1
DIALOG --infobox "Setup keys created:\n\nCommon name(CN) ${CN}\nused for your keys in ${_DESTDIR}/${KEYDIR}\n\nContinuing in 10 seconds ..." 8 60
sleep 10
else
@ -271,7 +271,7 @@ do_mok_sign () {
DIALOG --msgbox "Password didn't match or was empty, please enter again." 6 65
fi
done
mokutil -i "${_DESTDIR}"/"${KEYDIR}"/MOK/MOK.cer < ${MOK_PW} > "${LOG}"
mokutil -i "${_DESTDIR}"/"${KEYDIR}"/MOK/MOK.cer < ${MOK_PW} > "${_LOG}"
rm /tmp/.password
DIALOG --infobox "MOK keys have been installed successfully.\n\nContinuing in 5 seconds ..." 5 50
sleep 5
@ -280,11 +280,11 @@ do_mok_sign () {
DIALOG --yesno "Do you want to sign with the MOK certificate?\n\n/boot/${VMLINUZ} and ${UEFI_BOOTLOADER_DIR}/grub${_SPEC_UEFI_ARCH}.efi" 7 55 && SIGN_MOK="1"
if [[ "${SIGN_MOK}" == "1" ]]; then
if [[ "${_DESTDIR}" == "/install" ]]; then
systemd-nspawn -q -D "${_DESTDIR}" sbsign --key /"${KEYDIR}"/MOK/MOK.key --cert /"${KEYDIR}"/MOK/MOK.crt --output /boot/"${VMLINUZ}" /boot/"${VMLINUZ}" > "${LOG}" 2>&1
systemd-nspawn -q -D "${_DESTDIR}" sbsign --key /"${KEYDIR}"/MOK/MOK.key --cert /"${KEYDIR}"/MOK/MOK.crt --output "${UEFI_BOOTLOADER_DIR}"/grub"${_SPEC_UEFI_ARCH}".efi "${UEFI_BOOTLOADER_DIR}"/grub"${_SPEC_UEFI_ARCH}".efi > "${LOG}" 2>&1
systemd-nspawn -q -D "${_DESTDIR}" sbsign --key /"${KEYDIR}"/MOK/MOK.key --cert /"${KEYDIR}"/MOK/MOK.crt --output /boot/"${VMLINUZ}" /boot/"${VMLINUZ}" > "${_LOG}" 2>&1
systemd-nspawn -q -D "${_DESTDIR}" sbsign --key /"${KEYDIR}"/MOK/MOK.key --cert /"${KEYDIR}"/MOK/MOK.crt --output "${UEFI_BOOTLOADER_DIR}"/grub"${_SPEC_UEFI_ARCH}".efi "${UEFI_BOOTLOADER_DIR}"/grub"${_SPEC_UEFI_ARCH}".efi > "${_LOG}" 2>&1
else
sbsign --key /"${KEYDIR}"/MOK/MOK.key --cert /"${KEYDIR}"/MOK/MOK.crt --output /boot/"${VMLINUZ}" /boot/"${VMLINUZ}" > "${LOG}" 2>&1
sbsign --key /"${KEYDIR}"/MOK/MOK.key --cert /"${KEYDIR}"/MOK/MOK.crt --output "${UEFI_BOOTLOADER_DIR}"/grub"${_SPEC_UEFI_ARCH}".efi "${UEFI_BOOTLOADER_DIR}"/grub"${_SPEC_UEFI_ARCH}".efi > "${LOG}" 2>&1
sbsign --key /"${KEYDIR}"/MOK/MOK.key --cert /"${KEYDIR}"/MOK/MOK.crt --output /boot/"${VMLINUZ}" /boot/"${VMLINUZ}" > "${_LOG}" 2>&1
sbsign --key /"${KEYDIR}"/MOK/MOK.key --cert /"${KEYDIR}"/MOK/MOK.crt --output "${UEFI_BOOTLOADER_DIR}"/grub"${_SPEC_UEFI_ARCH}".efi "${UEFI_BOOTLOADER_DIR}"/grub"${_SPEC_UEFI_ARCH}".efi > "${_LOG}" 2>&1
fi
DIALOG --infobox "/boot/${VMLINUZ} and ${UEFI_BOOTLOADER_DIR}/grub${_SPEC_UEFI_ARCH}.efi\n\nbeen signed successfully.\n\nContinuing in 5 seconds ..." 7 60
sleep 5
@ -450,8 +450,8 @@ timeout 5
default archlinux-core-main
GUMEOF
chroot_mount
chroot "${_DESTDIR}" bootctl --path="${UEFISYS_MP}" install >"${LOG}" 2>&1
chroot "${_DESTDIR}" bootctl --path="${UEFISYS_MP}" update >"${LOG}" 2>&1
chroot "${_DESTDIR}" bootctl --path="${UEFISYS_MP}" install >"${_LOG}" 2>&1
chroot "${_DESTDIR}" bootctl --path="${UEFISYS_MP}" update >"${_LOG}" 2>&1
chroot_umount
if [[ -e "${_DESTDIR}/${UEFISYS_MP}/EFI/systemd/systemd-boot${_SPEC_UEFI_ARCH}.efi" ]]; then
rm -f "${_DESTDIR}/${UEFISYS_MP}/EFI/BOOT/BOOT${_UEFI_ARCH}.EFI"
@ -880,7 +880,7 @@ do_grub_uefi() {
--no-nvram \
--recheck \
--debug &> "/tmp/grub_uefi_${_UEFI_ARCH}_install.log"
cat "/tmp/grub_uefi_${_UEFI_ARCH}_install.log" >> "${LOG}"
cat "/tmp/grub_uefi_${_UEFI_ARCH}_install.log" >> "${_LOG}"
GRUB_PREFIX_DIR="/boot/grub/"
fi
chroot_umount

2
usr/lib/archboot/installer/btrfs.sh
View file

@ -212,7 +212,7 @@ check_btrfs_subvolume(){
# create btrfs subvolume
create_btrfs_subvolume() {
mount_btrfs
btrfs subvolume create "${BTRFSMP}"/"${_btrfssubvolume}" > "${LOG}"
btrfs subvolume create "${BTRFSMP}"/"${_btrfssubvolume}" > "${_LOG}"
# change permission from 700 to 755
# to avoid warnings during package installation
chmod 755 "${BTRFSMP}"/"${_btrfssubvolume}"

4
usr/lib/archboot/installer/configuration.sh
View file

@ -89,9 +89,9 @@ run_mkinitcpio() {
chroot_mount
echo "Initramfs progress ..." > /tmp/mkinitcpio.log
if [[ "${RUNNING_ARCH}" == "aarch64" ]]; then
chroot "${_DESTDIR}" mkinitcpio -p "${KERNELPKG}"-"${RUNNING_ARCH}" |& tee -a "${LOG}" /tmp/mkinitcpio.log >/dev/null 2>&1
chroot "${_DESTDIR}" mkinitcpio -p "${KERNELPKG}"-"${RUNNING_ARCH}" |& tee -a "${_LOG}" /tmp/mkinitcpio.log >/dev/null 2>&1
else
chroot "${_DESTDIR}" mkinitcpio -p "${KERNELPKG}" |& tee -a "${LOG}" /tmp/mkinitcpio.log >/dev/null 2>&1
chroot "${_DESTDIR}" mkinitcpio -p "${KERNELPKG}" |& tee -a "${_LOG}" /tmp/mkinitcpio.log >/dev/null 2>&1
fi
echo $? > /tmp/.mkinitcpio-retcode
if [[ $(cat /tmp/.mkinitcpio-retcode) -ne 0 ]]; then

26
usr/lib/archboot/installer/mountpoints.sh
View file

@ -289,14 +289,14 @@ _mkfs() {
if [[ "${_fstype}" == "swap" ]]; then
swapoff "${_device}" >/dev/null 2>&1
if [[ "${_domk}" == "yes" ]]; then
mkswap -L "${_labelname}" "${_device}" >"${LOG}" 2>&1
mkswap -L "${_labelname}" "${_device}" >"${_LOG}" 2>&1
#shellcheck disable=SC2181
if [[ $? != 0 ]]; then
DIALOG --msgbox "Error creating swap: mkswap ${_device}" 0 0
return 1
fi
fi
swapon "${_device}" >"${LOG}" 2>&1
swapon "${_device}" >"${_LOG}" 2>&1
#shellcheck disable=SC2181
if [[ $? != 0 ]]; then
DIALOG --msgbox "Error activating swap: swapon ${_device}" 0 0
@ -317,16 +317,16 @@ _mkfs() {
local ret
#shellcheck disable=SC2086
case ${_fstype} in
xfs) mkfs.xfs ${_fsoptions} -L "${_labelname}" -f ${_device} >"${LOG}" 2>&1; ret=$? ;;
jfs) yes | mkfs.jfs ${_fsoptions} -L "${_labelname}" ${_device} >"${LOG}" 2>&1; ret=$? ;;
ext2) mkfs.ext2 -F -L ${_fsoptions} "${_labelname}" ${_device} >"${LOG}" 2>&1; ret=$? ;;
ext3) mke2fs -F ${_fsoptions} -L "${_labelname}" -t ext3 ${_device} >"${LOG}" 2>&1; ret=$? ;;
ext4) mke2fs -F ${_fsoptions} -L "${_labelname}" -t ext4 ${_device} >"${LOG}" 2>&1; ret=$? ;;
xfs) mkfs.xfs ${_fsoptions} -L "${_labelname}" -f ${_device} >"${_LOG}" 2>&1; ret=$? ;;
jfs) yes | mkfs.jfs ${_fsoptions} -L "${_labelname}" ${_device} >"${_LOG}" 2>&1; ret=$? ;;
ext2) mkfs.ext2 -F -L ${_fsoptions} "${_labelname}" ${_device} >"${_LOG}" 2>&1; ret=$? ;;
ext3) mke2fs -F ${_fsoptions} -L "${_labelname}" -t ext3 ${_device} >"${_LOG}" 2>&1; ret=$? ;;
ext4) mke2fs -F ${_fsoptions} -L "${_labelname}" -t ext4 ${_device} >"${_LOG}" 2>&1; ret=$? ;;
f2fs) mkfs.f2fs ${_fsoptions} -f -l "${_labelname}" \
-O extra_attr,inode_checksum,sb_checksum ${_device} >"${LOG}" 2>&1; ret=$? ;;
btrfs) mkfs.btrfs -f ${_fsoptions} -L "${_labelname}" ${_btrfsdevices} >"${LOG}" 2>&1; ret=$? ;;
nilfs2) mkfs.nilfs2 -f ${_fsoptions} -L "${_labelname}" ${_device} >"${LOG}" 2>&1; ret=$? ;;
vfat) mkfs.vfat -F32 ${_fsoptions} -n "${_labelname}" ${_device} >"${LOG}" 2>&1; ret=$? ;;
-O extra_attr,inode_checksum,sb_checksum ${_device} >"${_LOG}" 2>&1; ret=$? ;;
btrfs) mkfs.btrfs -f ${_fsoptions} -L "${_labelname}" ${_btrfsdevices} >"${_LOG}" 2>&1; ret=$? ;;
nilfs2) mkfs.nilfs2 -f ${_fsoptions} -L "${_labelname}" ${_device} >"${_LOG}" 2>&1; ret=$? ;;
vfat) mkfs.vfat -F32 ${_fsoptions} -n "${_labelname}" ${_device} >"${_LOG}" 2>&1; ret=$? ;;
# don't handle anything else here, we will error later
esac
if [[ ${ret} != 0 ]]; then
@ -358,14 +358,14 @@ _mkfs() {
# eleminate spaces at beginning and end, replace other spaces with ,
_mountoptions="$(echo "${_mountoptions}" | sed -e 's#^ *##g' -e 's# *$##g' | sed -e 's# #,#g')"
# mount the bad boy
mount -t "${_fstype}" -o "${_mountoptions}" "${_device}" "${_dest}""${_mountpoint}" >"${LOG}" 2>&1
mount -t "${_fstype}" -o "${_mountoptions}" "${_device}" "${_dest}""${_mountpoint}" >"${_LOG}" 2>&1
#shellcheck disable=SC2181
if [[ $? != 0 ]]; then
DIALOG --msgbox "Error mounting ${_dest}${_mountpoint}" 0 0
return 1
fi
# btrfs needs balancing on fresh created raid, else weird things could happen
[[ "${_fstype}" == "btrfs" && "${_domk}" == "yes" ]] && btrfs balance start --full-balance "${_dest}""${_mountpoint}" >"${LOG}" 2>&1
[[ "${_fstype}" == "btrfs" && "${_domk}" == "yes" ]] && btrfs balance start --full-balance "${_dest}""${_mountpoint}" >"${_LOG}" 2>&1
# change permission of base directories to correct permission
# to avoid btrfs issues
if [[ "${_mountpoint}" == "/tmp" ]]; then

6
usr/lib/archboot/installer/network.sh
View file

@ -162,15 +162,15 @@ donetwork() {
echo "DNS=${DNS}" >>"${NETWORK_PROFILE}"
fi
if [[ -e /etc/systemd/network/10-wired-auto-dhcp.network ]]; then
echo "Disabled Archboot's bootup wired auto dhcp browsing." > "${LOG}"
echo "Disabled Archboot's bootup wired auto dhcp browsing." > "${_LOG}"
rm /etc/systemd/network/10-wired-auto-dhcp.network
fi
echo "Using setup's network profile ${NETWORK_PROFILE} now..." > "${LOG}"
echo "Using setup's network profile ${NETWORK_PROFILE} now..." > "${_LOG}"
systemctl restart systemd-networkd
NETWORK_COUNT="0"
DIALOG --infobox "Waiting 30 seconds for network link to come up ..." 3 60
# add sleep here dhcp can need some time to get link
while ! ping -c1 www.google.com > "${LOG}" 2>&1; do
while ! ping -c1 www.google.com > "${_LOG}" 2>&1; do
sleep 1
NETWORK_COUNT="$((NETWORK_COUNT+1))"
[[ "${NETWORK_COUNT}" == "30" ]] && break

16
usr/lib/archboot/installer/pacman.sh
View file

@ -54,7 +54,7 @@ select_mirror() {
SYNC_URL=$(grep -E -o "${_server}.*" "${MIRRORLIST}" | head -n1)
fi
NEXTITEM="4"
echo "Using mirror: ${SYNC_URL}" > "${LOG}"
echo "Using mirror: ${SYNC_URL}" > "${_LOG}"
#shellcheck disable=SC2027,SC2086
echo "Server = "${SYNC_URL}"" >> /etc/pacman.d/mirrorlist
}
@ -75,7 +75,7 @@ dotesting() {
# check for updating complete environment with packages
update_environment() {
if [[ -d "/var/cache/pacman/pkg" ]] && [[ -n "$(ls -A "/var/cache/pacman/pkg")" ]]; then
echo "Packages are already in pacman cache ..." > "${LOG}"
echo "Packages are already in pacman cache ..." > "${_LOG}"
DIALOG --infobox "Packages are already in pacman cache. Continuing in 3 seconds ..." 3 70
sleep 3
else
@ -83,7 +83,7 @@ update_environment() {
if [[ "$(grep -w MemTotal /proc/meminfo | cut -d ':' -f2 | sed -e 's# ##g' -e 's#kB$##g')" -gt "2571000" ]]; then
if ! [[ "${RUNNING_ARCH}" == "riscv64" ]]; then
DIALOG --infobox "Refreshing package database ..." 3 70
pacman -Sy > "${LOG}" 2>&1
pacman -Sy > "${_LOG}" 2>&1
sleep 1
DIALOG --infobox "Checking on new online kernel version ..." 3 70
#shellcheck disable=SC2086
@ -95,7 +95,7 @@ update_environment() {
#shellcheck disable=SC2086
ONLINE_KERNEL="$(pacman -Si ${KERNELPKG} | grep Version | cut -d ':' -f2 | sed -e 's# ##')"
fi
echo "${LOCAL_KERNEL} local kernel version and ${ONLINE_KERNEL} online kernel version." > "${LOG}"
echo "${LOCAL_KERNEL} local kernel version and ${ONLINE_KERNEL} online kernel version." > "${_LOG}"
sleep 2
if [[ "${LOCAL_KERNEL}" == "${ONLINE_KERNEL}" ]]; then
DIALOG --infobox "No new kernel online available. Continuing in 3 seconds ..." 3 70
@ -104,7 +104,7 @@ update_environment() {
DIALOG --defaultno --yesno "New online kernel version ${ONLINE_KERNEL} available.\n\nDo you want to update the archboot environment to latest packages with caching packages for installation?\n\nATTENTION:\nThis will reboot the system using kexec!" 0 0 && UPDATE_ENVIRONMENT="1"
if [[ "${UPDATE_ENVIRONMENT}" == "1" ]]; then
DIALOG --infobox "Now setting up new archboot environment and dowloading latest packages.\n\nRunning at the moment: update-installer -latest-install\nCheck ${VC} console (ALT-F${VC_NUM}) for progress...\n\nGet a cup of coffee ...\nDepending on your system's setup, this needs about 5 minutes.\nPlease be patient." 0 0
update-installer -latest-install > "${LOG}" 2>&1
update-installer -latest-install > "${_LOG}" 2>&1
fi
fi
fi
@ -131,12 +131,12 @@ prepare_pacman() {
done
[[ -e /etc/systemd/system/pacman-init.service ]] && systemctl stop pacman-init.service
DIALOG --infobox "Refreshing package database ..." 3 40
${PACMAN} -Sy > "${LOG}" 2>&1 || (DIALOG --msgbox "Pacman preparation failed! Check ${LOG} for errors." 6 60; return 1)
${PACMAN} -Sy > "${_LOG}" 2>&1 || (DIALOG --msgbox "Pacman preparation failed! Check ${_LOG} for errors." 6 60; return 1)
DIALOG --infobox "Update Arch Linux keyring ..." 3 40
KEYRING="archlinux-keyring"
[[ "${RUNNING_ARCH}" == "aarch64" ]] && KEYRING="${KEYRING} archlinuxarm-keyring"
#shellcheck disable=SC2086
pacman -Sy ${PACMAN_CONF} --noconfirm --noprogressbar ${KEYRING} > "${LOG}" 2>&1 || (DIALOG --msgbox "Keyring update failed! Check ${LOG} for errors." 6 60; return 1)
pacman -Sy ${PACMAN_CONF} --noconfirm --noprogressbar ${KEYRING} > "${_LOG}" 2>&1 || (DIALOG --msgbox "Keyring update failed! Check ${_LOG} for errors." 6 60; return 1)
}
# Set PACKAGES parameter before running to install wanted packages
@ -148,7 +148,7 @@ run_pacman(){
echo "Installing Packages ..." >/tmp/pacman.log
sleep 5
#shellcheck disable=SC2086,SC2069
${PACMAN} -S ${PACKAGES} |& tee -a "${LOG}" /tmp/pacman.log >/dev/null 2>&1
${PACMAN} -S ${PACKAGES} |& tee -a "${_LOG}" /tmp/pacman.log >/dev/null 2>&1
echo $? > /tmp/.pacman-retcode
if [[ $(cat /tmp/.pacman-retcode) -ne 0 ]]; then
echo -e "\nPackage Installation FAILED." >>/tmp/pacman.log

10
usr/lib/archboot/installer/partition.sh
View file

@ -14,9 +14,9 @@ check_gpt() {
[[ "$(${_BLKID} -p -i -o value -s PTTYPE "${DISC}")" == "gpt" ]] && GUID_DETECTED="1"
if [[ "${GUID_DETECTED}" == "" ]]; then
DIALOG --yesno "Setup detected no GUID (gpt) partition table on ${DISC}.\n\nDo you want to convert the existing MBR table in ${DISC} to a GUID (gpt) partition table?" 0 0 || return 1
sgdisk --mbrtogpt "${DISC}" > "${LOG}" && GUID_DETECTED="1"
sgdisk --mbrtogpt "${DISC}" > "${_LOG}" && GUID_DETECTED="1"
# reread partitiontable for kernel
partprobe "${DISC}" > "${LOG}"
partprobe "${DISC}" > "${_LOG}"
if [[ "${GUID_DETECTED}" == "" ]]; then
DIALOG --defaultno --yesno "Conversion failed on ${DISC}.\nSetup detected no GUID (gpt) partition table on ${DISC}.\n\nDo you want to create a new GUID (gpt) table now on ${DISC}?\n\n${DISC} will be COMPLETELY ERASED! Are you absolutely sure?" 0 0 || return 1
# clean partition table to avoid issues!
@ -56,8 +56,8 @@ check_efisys_part() {
GUID_DETECTED=""
DIALOG --defaultno --yesno "Setup detected no GUID (gpt) partition table on ${DISC}.\nUEFI boot requires ${DISC} to be partitioned as GPT.\n\nDo you want to convert the existing MBR table in ${DISC} to a GUID (gpt) partition table?" 0 0 || return 1
DIALOG --msgbox "Setup will now try to non-destructively convert ${DISC} to GPT using sgdisk." 0 0
sgdisk --mbrtogpt "${DISC}" > "${LOG}" && GUID_DETECTED="1"
partprobe "${DISC}" > "${LOG}"
sgdisk --mbrtogpt "${DISC}" > "${_LOG}" && GUID_DETECTED="1"
partprobe "${DISC}" > "${_LOG}"
if [[ "${GUID_DETECTED}" == "" ]]; then
DIALOG --msgbox "Conversion failed on ${DISC}.\nSetup detected no GUID (gpt) partition table on ${DISC}.\n\n You need to fix your partition table first, before setup can proceed." 0 0
return 1
@ -151,7 +151,7 @@ partition() {
# clean partitiontable to avoid issues!
dd if=/dev/zero of="${DEVICE}" bs=512 count=2048 >/dev/null 2>&1
wipefs -a "${DEVICE}" /dev/null 2>&1
parted -a optimal -s "${DISC}" mktable msdos >"${LOG}"
parted -a optimal -s "${DISC}" mktable msdos >"${_LOG}"
fi
# Partition disc
DIALOG --msgbox "Now you'll be put into cfdisk where you can partition your storage drive. You should make a swap partition and as many data partitions as you will need." 18 70