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

replace ACTIVATE with READY

Browse source
This commit is contained in:
Tobias Powalowski 2023-01-09 15:35:17 +01:00
parent a5bcb3c226
commit f4d7a23022
7 changed files with 42 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -100,7 +100,7 @@ _auto_pacman()
# enable it on installed system too! # enable it on installed system too!
_auto_testing() _auto_testing()
{ {
if [[ "${_DOTESTING}" == "yes" ]]; then if [[ "${_DOTESTING}" == 1 ]]; then
_dialog --infobox "Enable [testing] repository on installed system ..." 3 70 _dialog --infobox "Enable [testing] repository on installed system ..." 3 70
sed -i -e '/^#\[testing\]/ { n ; s/^#// }' "${_DESTDIR}"/etc/pacman.conf sed -i -e '/^#\[testing\]/ { n ; s/^#// }' "${_DESTDIR}"/etc/pacman.conf
sed -i -e '/^#\[community-testing\]/ { n ; s/^#// }' "${_DESTDIR}"/etc/pacman.conf sed -i -e '/^#\[community-testing\]/ { n ; s/^#// }' "${_DESTDIR}"/etc/pacman.conf

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

@ -285,7 +285,7 @@ _autoprepare() {
fi fi
## make and mount filesystems ## make and mount filesystems
for fsspec in ${_FSSPECS}; do for fsspec in ${_FSSPECS}; do
_DOMKFS="yes" _DOMKFS=1
_PART="${_DEVICE}$(echo "${fsspec}" | tr -d ' ' | cut -f1 -d:)" _PART="${_DEVICE}$(echo "${fsspec}" | tr -d ' ' | cut -f1 -d:)"
# Add check on nvme or mmc controller: # Add check on nvme or mmc controller:
# NVME uses /dev/nvme0n1pX name scheme # NVME uses /dev/nvme0n1pX name scheme
@ -303,7 +303,7 @@ _autoprepare() {
_BTRFS_COMPRESS="compress=zstd" _BTRFS_COMPRESS="compress=zstd"
[[ "${_MP}" == "/" ]] && _BTRFS_SUBVOLUME="root" [[ "${_MP}" == "/" ]] && _BTRFS_SUBVOLUME="root"
[[ "${_MP}" == "/home" ]] && _BTRFS_SUBVOLUME="home" && _DOMKFS="no" [[ "${_MP}" == "/home" ]] && _BTRFS_SUBVOLUME="home" && _DOMKFS="no"
_DOSUBVOLUME="yes" _DOSUBVOLUME=1
else else
_BTRFS_COMPRESS="NONE" _BTRFS_COMPRESS="NONE"
_BTRFS_SUBVOLUME="NONE" _BTRFS_SUBVOLUME="NONE"

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

@ -244,7 +244,7 @@ _activate_dmraid()
# activate lvm2 devices # activate lvm2 devices
_activate_lvm2() _activate_lvm2()
{ {
_ACTIVATE_LVM2="" _LVM2_READY=""
if [[ -e /usr/bin/lvm ]]; then if [[ -e /usr/bin/lvm ]]; then
_OLD_LVM2_GROUPS=${_LVM2_GROUPS} _OLD_LVM2_GROUPS=${_LVM2_GROUPS}
_OLD_LVM2_VOLUMES=${_LVM2_VOLUMES} _OLD_LVM2_VOLUMES=${_LVM2_VOLUMES}
@ -254,7 +254,7 @@ _activate_lvm2()
lvm vgchange --ignorelockingfailure --ignoremonitoring -ay >/dev/null 2>&1 lvm vgchange --ignorelockingfailure --ignoremonitoring -ay >/dev/null 2>&1
_LVM2_GROUPS="$(vgs -o vg_name --noheading 2>/dev/null)" _LVM2_GROUPS="$(vgs -o vg_name --noheading 2>/dev/null)"
_LVM2_VOLUMES="$(lvs -o vg_name,lv_name --noheading --separator - 2>/dev/null)" _LVM2_VOLUMES="$(lvs -o vg_name,lv_name --noheading --separator - 2>/dev/null)"
[[ "${_OLD_LVM2_GROUPS}" == "${_LVM2_GROUPS}" && "${_OLD_LVM2_VOLUMES}" == "${_LVM2_VOLUMES}" ]] && _ACTIVATE_LVM2="no" [[ "${_OLD_LVM2_GROUPS}" == "${_LVM2_GROUPS}" && "${_OLD_LVM2_VOLUMES}" == "${_LVM2_VOLUMES}" ]] && _LVM2_READY="1"
fi fi
} }
@ -262,10 +262,10 @@ _activate_lvm2()
# activate md devices # activate md devices
_activate_raid() _activate_raid()
{ {
_ACTIVATE_RAID="" _RAID_READY=""
if [[ -e /usr/bin/mdadm ]]; then if [[ -e /usr/bin/mdadm ]]; then
_dialog --infobox "Activating RAID arrays..." 0 0 _dialog --infobox "Activating RAID arrays..." 0 0
mdadm --assemble --scan >/dev/null 2>&1 || _ACTIVATE_RAID="no" mdadm --assemble --scan >/dev/null 2>&1 || _RAID_READY="1"
fi fi
} }
@ -273,7 +273,7 @@ _activate_raid()
# activate luks devices # activate luks devices
_activate_luks() _activate_luks()
{ {
_ACTIVATE_LUKS="" _LUKS_READY=""
if [[ -e /usr/bin/cryptsetup ]]; then if [[ -e /usr/bin/cryptsetup ]]; then
_dialog --infobox "Scanning for luks encrypted devices..." 0 0 _dialog --infobox "Scanning for luks encrypted devices..." 0 0
if ${_LSBLK} FSTYPE | grep -q "crypto_LUKS"; then if ${_LSBLK} FSTYPE | grep -q "crypto_LUKS"; then
@ -283,13 +283,13 @@ _activate_luks()
_RUN_LUKS="" _RUN_LUKS=""
_dialog --yesno "Setup detected luks encrypted device, do you want to activate ${part} ?" 0 0 && _RUN_LUKS=1 _dialog --yesno "Setup detected luks encrypted device, do you want to activate ${part} ?" 0 0 && _RUN_LUKS=1
[[ "${_RUN_LUKS}" == 1 ]] && _enter_luks_name && _enter_luks_passphrase && _opening_luks [[ "${_RUN_LUKS}" == 1 ]] && _enter_luks_name && _enter_luks_passphrase && _opening_luks
[[ "${_RUN_LUKS}" == "" ]] && _ACTIVATE_LUKS="no" [[ "${_RUN_LUKS}" == "" ]] && _LUKS_READY="1"
else else
_ACTIVATE_LUKS="no" _LUKS_READY="1"
fi fi
done done
else else
_ACTIVATE_LUKS="no" _LUKS_READY="1"
fi fi
fi fi
} }
@ -300,11 +300,11 @@ _activate_luks()
# run it more times if needed, it can be hidden by each other! # run it more times if needed, it can be hidden by each other!
_activate_special_devices() _activate_special_devices()
{ {
_ACTIVATE_RAID="" _RAID_READY=""
_ACTIVATE_LUKS="" _LUKS_READY=""
_ACTIVATE_LVM2="" _LVM2_READY=""
_activate_dmraid _activate_dmraid
while ! [[ "${_ACTIVATE_LVM2}" == "no" && "${_ACTIVATE_RAID}" == "no" && "${_ACTIVATE_LUKS}" == "no" ]]; do while [[ -n"${_LVM2_READY}" && -n "${_RAID_READY}" && -n "${_LUKS_READY}" ]]; do
_activate_raid _activate_raid
_activate_lvm2 _activate_lvm2
_activate_luks _activate_luks

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

@ -82,10 +82,10 @@ _check_btrfs_filesystem_creation() {
for i in $(grep "${_PART}[:#]" /tmp/.parts); do for i in $(grep "${_PART}[:#]" /tmp/.parts); do
if echo "${i}" | grep -q ":btrfs:"; then if echo "${i}" | grep -q ":btrfs:"; then
_FSTYPE="btrfs" _FSTYPE="btrfs"
_SKIP_FILESYSTEM="yes" _SKIP_FILESYSTEM=1
# check on filesystem creation, skip subvolume asking then! # check on filesystem creation, skip subvolume asking then!
echo "${i}" | cut -d: -f 4 | grep -q yes && _DETECT_CREATE_FILESYSTEM="yes" echo "${i}" | cut -d: -f 4 | grep -q yes && _DETECT_CREATE_FILESYSTEM=1
[[ "${_DETECT_CREATE_FILESYSTEM}" == "yes" ]] && _SKIP_ASK_SUBVOLUME="yes" [[ "${_DETECT_CREATE_FILESYSTEM}" == 1 ]] && _SKIP_ASK_SUBVOLUME=1
fi fi
done done
} }
@ -172,11 +172,11 @@ _prepare_btrfs_subvolume() {
_DOSUBVOLUME="no" _DOSUBVOLUME="no"
_BTRFS_SUBVOLUME="NONE" _BTRFS_SUBVOLUME="NONE"
if [[ "${_SKIP_ASK_SUBVOLUME}" == "no" ]]; then if [[ "${_SKIP_ASK_SUBVOLUME}" == "no" ]]; then
_dialog --defaultno --yesno "Would you like to create a new subvolume on ${_PART}?" 0 0 && _DOSUBVOLUME="yes" _dialog --defaultno --yesno "Would you like to create a new subvolume on ${_PART}?" 0 0 && _DOSUBVOLUME=1
else else
_DOSUBVOLUME="yes" _DOSUBVOLUME=1
fi fi
if [[ "${_DOSUBVOLUME}" == "yes" ]]; then if [[ "${_DOSUBVOLUME}" == 1 ]]; then
_BTRFS_SUBVOLUME="NONE" _BTRFS_SUBVOLUME="NONE"
while [[ "${_BTRFS_SUBVOLUME}" == "NONE" ]]; do while [[ "${_BTRFS_SUBVOLUME}" == "NONE" ]]; do
_dialog --inputbox "Enter the SUBVOLUME name for the device, keep it short\nand use no spaces or special\ncharacters." 10 65 2>"${_ANSWER}" || return 1 _dialog --inputbox "Enter the SUBVOLUME name for the device, keep it short\nand use no spaces or special\ncharacters." 10 65 2>"${_ANSWER}" || return 1
@ -190,7 +190,7 @@ _prepare_btrfs_subvolume() {
# check btrfs subvolume # check btrfs subvolume
_check_btrfs_subvolume(){ _check_btrfs_subvolume(){
[[ "${_DOMKFS}" == "yes" && "${_FSTYPE}" == "btrfs" ]] && _DETECT_CREATE_FILESYSTEM="yes" [[ "${_DOMKFS}" == 1 && "${_FSTYPE}" == "btrfs" ]] && _DETECT_CREATE_FILESYSTEM=1
if [[ "${_DETECT_CREATE_FILESYSTEM}" == "no" ]]; then if [[ "${_DETECT_CREATE_FILESYSTEM}" == "no" ]]; then
_mount_btrfs _mount_btrfs
for i in $(btrfs subvolume list "${_BTRFSMP}" | cut -d " " -f 7); do for i in $(btrfs subvolume list "${_BTRFSMP}" | cut -d " " -f 7); do
@ -225,7 +225,7 @@ _choose_btrfs_subvolume () {
_SUBVOLUMES_DETECTED="no" _SUBVOLUMES_DETECTED="no"
_SUBVOLUMES=$(find_btrfs_subvolume _) _SUBVOLUMES=$(find_btrfs_subvolume _)
# check if subvolumes are present # check if subvolumes are present
[[ -n "${_SUBVOLUMES}" ]] && _SUBVOLUMES_DETECTED="yes" [[ -n "${_SUBVOLUMES}" ]] && _SUBVOLUMES_DETECTED=1
_subvolumes_in_use _subvolumes_in_use
for i in ${_SUBVOLUME_IN_USE}; do for i in ${_SUBVOLUME_IN_USE}; do
#shellcheck disable=SC2001,SC2086 #shellcheck disable=SC2001,SC2086
@ -236,7 +236,7 @@ _choose_btrfs_subvolume () {
_dialog --menu "Select the subvolume to mount:" 15 50 13 ${_SUBVOLUMES} 2>"${_ANSWER}" || return 1 _dialog --menu "Select the subvolume to mount:" 15 50 13 ${_SUBVOLUMES} 2>"${_ANSWER}" || return 1
_BTRFS_SUBVOLUME=$(cat "${_ANSWER}") _BTRFS_SUBVOLUME=$(cat "${_ANSWER}")
else else
if [[ "${_SUBVOLUMES_DETECTED}" == "yes" ]]; then if [[ "${_SUBVOLUMES_DETECTED}" == 1 ]]; then
_dialog --msgbox "ERROR: All subvolumes of the device are already in use. Switching to create a new one now." 8 65 _dialog --msgbox "ERROR: All subvolumes of the device are already in use. Switching to create a new one now." 8 65
_SKIP_ASK_SUBVOLUME=yes _SKIP_ASK_SUBVOLUME=yes
_prepare_btrfs_subvolume || return 1 _prepare_btrfs_subvolume || return 1
@ -261,7 +261,7 @@ _btrfs_subvolume() {
fi fi
_btrfs_compress _btrfs_compress
fi fi
_FILESYSTEM_FINISH="yes" _FILESYSTEM_FINISH=1
} }
# ask for btrfs compress option # ask for btrfs compress option

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

@ -92,8 +92,8 @@ _create_filesystem() {
_FS_OPTIONS="" _FS_OPTIONS=""
_BTRFS_DEVICES="" _BTRFS_DEVICES=""
_BTRFS_LEVEL="" _BTRFS_LEVEL=""
_dialog --yesno "Would you like to create a filesystem on ${_PART}?\n\n(This will overwrite existing data!)" 0 0 && _DOMKFS="yes" _dialog --yesno "Would you like to create a filesystem on ${_PART}?\n\n(This will overwrite existing data!)" 0 0 && _DOMKFS=1
if [[ "${_DOMKFS}" == "yes" ]]; then if [[ "${_DOMKFS}" == 1 ]]; then
while [[ "${_LABEL_NAME}" == "" ]]; do while [[ "${_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 \ _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 "${_PART}")" 2>"${_ANSWER}" || return 1 "$(${_LSBLK} LABEL "${_PART}")" 2>"${_ANSWER}" || return 1
@ -110,7 +110,7 @@ _create_filesystem() {
_dialog --inputbox "Enter additional options to the filesystem creation utility.\nUse this field only, if the defaults are not matching your needs,\nelse just leave it empty." 10 70 2>"${_ANSWER}" || return 1 _dialog --inputbox "Enter additional options to the filesystem creation utility.\nUse this field only, if the defaults are not matching your needs,\nelse just leave it empty." 10 70 2>"${_ANSWER}" || return 1
_FS_OPTIONS=$(cat "${_ANSWER}") _FS_OPTIONS=$(cat "${_ANSWER}")
fi fi
_FILESYSTEM_FINISH="yes" _FILESYSTEM_FINISH=1
} }
mountpoints() { mountpoints() {
@ -139,12 +139,12 @@ mountpoints() {
if [[ "${_ASK_MOUNTPOINTS}" == 1 ]]; then if [[ "${_ASK_MOUNTPOINTS}" == 1 ]]; then
_create_filesystem _create_filesystem
else else
_FILESYSTEM_FINISH="yes" _FILESYSTEM_FINISH=1
fi fi
else else
_FILESYSTEM_FINISH="yes" _FILESYSTEM_FINISH=1
fi fi
[[ "${_FILESYSTEM_FINISH}" == "yes" ]] && _DO_SWAP=DONE [[ "${_FILESYSTEM_FINISH}" == 1 ]] && _DO_SWAP=DONE
done done
_check_mkfs_values _check_mkfs_values
if [[ "${_PART}" != "NONE" ]]; then if [[ "${_PART}" != "NONE" ]]; then
@ -168,7 +168,7 @@ mountpoints() {
else else
_btrfs_subvolume _btrfs_subvolume
fi fi
[[ "${_FILESYSTEM_FINISH}" == "yes" ]] && _DO_ROOT=DONE [[ "${_FILESYSTEM_FINISH}" == 1 ]] && _DO_ROOT=DONE
done done
_find_btrfs_raid_DEVICEs _find_btrfs_raid_DEVICEs
_btrfs_parts _btrfs_parts
@ -198,9 +198,9 @@ mountpoints() {
_btrfs_subvolume _btrfs_subvolume
fi fi
else else
_FILESYSTEM_FINISH="yes" _FILESYSTEM_FINISH=1
fi fi
[[ "${_FILESYSTEM_FINISH}" == "yes" ]] && _DO_ADDITIONAL="DONE" [[ "${_FILESYSTEM_FINISH}" == 1 ]] && _DO_ADDITIONAL="DONE"
done done
if [[ "${_PART}" != "DONE" ]]; then if [[ "${_PART}" != "DONE" ]]; then
_find_btrfs_raid_DEVICEs _find_btrfs_raid_DEVICEs
@ -229,7 +229,7 @@ mountpoints() {
_BTRFS_SUBVOLUME=$(echo "${line}" | cut -d: -f 9) _BTRFS_SUBVOLUME=$(echo "${line}" | cut -d: -f 9)
_DOSUBVOLUME=$(echo "${line}" | cut -d: -f 10) _DOSUBVOLUME=$(echo "${line}" | cut -d: -f 10)
_BTRFS_COMPRESS=$(echo "${line}" | cut -d: -f 11) _BTRFS_COMPRESS=$(echo "${line}" | cut -d: -f 11)
if [[ "${_DOMKFS}" == "yes" ]]; then if [[ "${_DOMKFS}" == 1 ]]; then
if [[ "${_FSTYPE}" == "swap" ]]; then if [[ "${_FSTYPE}" == "swap" ]]; then
_dialog --infobox "Creating and activating \nswapspace on \n${_PART} ..." 0 0 _dialog --infobox "Creating and activating \nswapspace on \n${_PART} ..." 0 0
else else
@ -288,7 +288,7 @@ _mkfs() {
# we have two main cases: "swap" and everything else. # we have two main cases: "swap" and everything else.
if [[ "${_FSTYPE}" == "swap" ]]; then if [[ "${_FSTYPE}" == "swap" ]]; then
swapoff "${_DEVICE}" >/dev/null 2>&1 swapoff "${_DEVICE}" >/dev/null 2>&1
if [[ "${_DOMK}" == "yes" ]]; then if [[ "${_DOMK}" == 1 ]]; then
mkswap -L "${_LABELNAME}" "${_DEVICE}" >"${_LOG}" 2>&1 mkswap -L "${_LABELNAME}" "${_DEVICE}" >"${_LOG}" 2>&1
#shellcheck disable=SC2181 #shellcheck disable=SC2181
if [[ $? != 0 ]]; then if [[ $? != 0 ]]; then
@ -313,7 +313,7 @@ _mkfs() {
return 1 return 1
fi fi
# if we were tasked to create the filesystem, do so # if we were tasked to create the filesystem, do so
if [[ "${_DOMK}" == "yes" ]]; then if [[ "${_DOMK}" == 1 ]]; then
local ret local ret
#shellcheck disable=SC2086 #shellcheck disable=SC2086
case ${_FSTYPE} in case ${_FSTYPE} in
@ -335,7 +335,7 @@ _mkfs() {
fi fi
sleep 2 sleep 2
fi fi
if [[ "${_FSTYPE}" == "btrfs" && -n "${_BTRFS_SUBVOLUME}" && "${_DOSUBVOLUME}" == "yes" ]]; then if [[ "${_FSTYPE}" == "btrfs" && -n "${_BTRFS_SUBVOLUME}" && "${_DOSUBVOLUME}" == 1 ]]; then
_create_btrfs_subvolume _create_btrfs_subvolume
fi fi
_btrfs_scan _btrfs_scan
@ -365,7 +365,7 @@ _mkfs() {
return 1 return 1
fi fi
# btrfs needs balancing on fresh created raid, else weird things could happen # 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}" == 1 ]] && btrfs balance start --full-balance "${_DEST}""${_MOUNTPOINT}" >"${_LOG}" 2>&1
# change permission of base directories to correct permission # change permission of base directories to correct permission
# to avoid btrfs issues # to avoid btrfs issues
if [[ "${_MOUNTPOINT}" == "/tmp" ]]; then if [[ "${_MOUNTPOINT}" == "/tmp" ]]; then

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

@ -44,7 +44,7 @@ _do_wireless() {
"secret" 2>"${_ANSWER}" || return 1 "secret" 2>"${_ANSWER}" || return 1
_WLAN_SSID=$(cat "${_ANSWER}") _WLAN_SSID=$(cat "${_ANSWER}")
_WLAN_CONNECT="connect-hidden" _WLAN_CONNECT="connect-hidden"
_WLAN_HIDDEN="yes" _WLAN_HIDDEN=1
fi fi
# replace # with spaces again # replace # with spaces again
#shellcheck disable=SC2001,SC2086 #shellcheck disable=SC2001,SC2086

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

@ -59,8 +59,8 @@ _select_mirror() {
# enable testing repository on network install # enable testing repository on network install
_dotesting() { _dotesting() {
if ! grep -q "^\[testing\]" /etc/pacman.conf; then if ! grep -q "^\[testing\]" /etc/pacman.conf; then
_dialog --defaultno --yesno "Do you want to enable [testing]\nand [community-testing] repositories?\n\nOnly enable this if you need latest\navailable packages for testing purposes!" 9 50 && _DOTESTING="yes" _dialog --defaultno --yesno "Do you want to enable [testing]\nand [community-testing] repositories?\n\nOnly enable this if you need latest\navailable packages for testing purposes!" 9 50 && _DOTESTING=1
if [[ "${_DOTESTING}" == "yes" ]]; then if [[ "${_DOTESTING}" == 1 ]]; then
sed -i -e '/^#\[testing\]/ { n ; s/^#// }' /etc/pacman.conf sed -i -e '/^#\[testing\]/ { n ; s/^#// }' /etc/pacman.conf
sed -i -e '/^#\[community-testing\]/ { n ; s/^#// }' /etc/pacman.conf sed -i -e '/^#\[community-testing\]/ { n ; s/^#// }' /etc/pacman.conf
sed -i -e 's:^#\[testing\]:\[testing\]:g' -e 's:^#\[community-testing\]:\[community-testing\]:g' /etc/pacman.conf sed -i -e 's:^#\[testing\]:\[testing\]:g' -e 's:^#\[community-testing\]:\[community-testing\]:g' /etc/pacman.conf