mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 12:00:37 +02:00
fix tty detection
This commit is contained in:
parent
e84b74f885
commit
231a8a17c9
1 changed files with 4 additions and 6 deletions
|
@ -2,6 +2,8 @@
|
||||||
# SPDX-License-Identifier: GPL-2.0-only
|
# SPDX-License-Identifier: GPL-2.0-only
|
||||||
# created by Tobias Powalowski <tpowa@archlinux.org>
|
# created by Tobias Powalowski <tpowa@archlinux.org>
|
||||||
. /usr/lib/archboot/common.sh
|
. /usr/lib/archboot/common.sh
|
||||||
|
[[ -z $TTY ]] && TTY=$(tty)
|
||||||
|
TTY=${TTY#/dev/}
|
||||||
|
|
||||||
_welcome () {
|
_welcome () {
|
||||||
[[ "$(uname -m)" == "x86_64" ]] && echo -e "\e[1mWelcome to \e[36mArchboot\e[m\e[1m - Arch Linux X86_64\e[m"
|
[[ "$(uname -m)" == "x86_64" ]] && echo -e "\e[1mWelcome to \e[36mArchboot\e[m\e[1m - Arch Linux X86_64\e[m"
|
||||||
|
@ -41,8 +43,6 @@ EOF
|
||||||
# fstrim <mountpoint> for manual action
|
# fstrim <mountpoint> for manual action
|
||||||
# it needs some seconds to get RAM free on delete!
|
# it needs some seconds to get RAM free on delete!
|
||||||
_switch_root_zram() {
|
_switch_root_zram() {
|
||||||
[[ -z $TTY ]] && TTY=$(tty)
|
|
||||||
TTY=${TTY#/dev/}
|
|
||||||
if [[ "${TTY}" = "tty1" ]]; then
|
if [[ "${TTY}" = "tty1" ]]; then
|
||||||
clear
|
clear
|
||||||
[[ -d /sysroot ]] || mkdir /sysroot
|
[[ -d /sysroot ]] || mkdir /sysroot
|
||||||
|
@ -92,7 +92,6 @@ fi
|
||||||
}
|
}
|
||||||
|
|
||||||
_enter_shell() {
|
_enter_shell() {
|
||||||
[[ -z $TTY ]] && TTY=$(tty)
|
|
||||||
# dbus sources profiles again
|
# dbus sources profiles again
|
||||||
if ! echo "${TTY}" | grep -q pts; then
|
if ! echo "${TTY}" | grep -q pts; then
|
||||||
echo -e "Hit \e[1m\e[92mENTER\e[m for \e[1mlogin\e[m routine."
|
echo -e "Hit \e[1m\e[92mENTER\e[m for \e[1mlogin\e[m routine."
|
||||||
|
@ -115,8 +114,6 @@ _run_latest_install() {
|
||||||
}
|
}
|
||||||
|
|
||||||
_run_update_installer() {
|
_run_update_installer() {
|
||||||
[[ -z $TTY ]] && TTY=$(tty)
|
|
||||||
TTY=${TTY#/dev/}
|
|
||||||
cd /
|
cd /
|
||||||
echo -e "\e[1m\e[92mMemory checks run successfully:\e[m"
|
echo -e "\e[1m\e[92mMemory checks run successfully:\e[m"
|
||||||
echo -e "\e[93mGo and get a cup of coffee. Depending on your system setup,\e[m"
|
echo -e "\e[93mGo and get a cup of coffee. Depending on your system setup,\e[m"
|
||||||
|
@ -174,7 +171,8 @@ if ! [[ -e /.clean-pacman-db ]]; then
|
||||||
rm -rf /var/lib/pacman/local/"${i}"-[0-9]* &>/dev/null
|
rm -rf /var/lib/pacman/local/"${i}"-[0-9]* &>/dev/null
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
if [[ "${TTY}" = "/dev/tty1" ]] ; then
|
|
||||||
|
if [[ "${TTY}" = "tty1" ]] ; then
|
||||||
if ! mount | grep -q zram0; then
|
if ! mount | grep -q zram0; then
|
||||||
_TITLE="Archboot $(uname -m) | Basic Setup | Moving to ZRAM"
|
_TITLE="Archboot $(uname -m) | Basic Setup | Moving to ZRAM"
|
||||||
_switch_root_zram | _dialog --title "Initializing..." --gauge "Creating /dev/zram0 with zstd compression..." 6 75 0 | tee -a /dev/ttyS0 /dev/ttyAMA0 /dev/ttyUSB0 /dev/pts/0 2>/dev/null
|
_switch_root_zram | _dialog --title "Initializing..." --gauge "Creating /dev/zram0 with zstd compression..." 6 75 0 | tee -a /dev/ttyS0 /dev/ttyAMA0 /dev/ttyUSB0 /dev/pts/0 2>/dev/null
|
||||||
|
|
Loading…
Reference in a new issue