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 VC _VC

Browse source
This commit is contained in:
Tobias Powalowski 2023-01-07 21:32:25 +01:00
parent 666f25927b
commit 50081a008c
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

@ -103,7 +103,7 @@ update_environment() {
else else
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" 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 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 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 fi
@ -144,7 +144,7 @@ run_pacman(){
# create chroot environment on target system # create chroot environment on target system
# code straight from mkarchroot # code straight from mkarchroot
chroot_mount chroot_mount
DIALOG --infobox "Pacman is running...\n\nInstalling package(s) to ${_DESTDIR}:\n${PACKAGES} ...\n\nCheck ${VC} console (ALT-F${VC_NUM}) for progress ..." 10 70 DIALOG --infobox "Pacman is running...\n\nInstalling package(s) to ${_DESTDIR}:\n${PACKAGES} ...\n\nCheck ${_VC} console (ALT-F${_VC_NUM}) for progress ..." 10 70
echo "Installing Packages ..." >/tmp/pacman.log echo "Installing Packages ..." >/tmp/pacman.log
sleep 5 sleep 5
#shellcheck disable=SC2086,SC2069 #shellcheck disable=SC2086,SC2069
@ -187,7 +187,7 @@ install_packages() {
auto_packages auto_packages
# fix double spaces # fix double spaces
PACKAGES="${PACKAGES// / }" PACKAGES="${PACKAGES// / }"
DIALOG --yesno "Next step will install the following packages for a minimal system:\n${PACKAGES}\n\nYou can watch the progress on your ${VC} console.\n\nDo you wish to continue?" 12 75 || return 1 DIALOG --yesno "Next step will install the following packages for a minimal system:\n${PACKAGES}\n\nYou can watch the progress on your ${_VC} console.\n\nDo you wish to continue?" 12 75 || return 1
run_pacman run_pacman
NEXTITEM="6" NEXTITEM="6"
chroot_mount chroot_mount