mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
only run launcher once
This commit is contained in:
parent
7ec96606d5
commit
18b0e65fa5
3 changed files with 10 additions and 10 deletions
|
@ -4,15 +4,6 @@
|
||||||
. /usr/lib/archboot/basic-common.sh
|
. /usr/lib/archboot/basic-common.sh
|
||||||
_TITLE="Archboot ${_RUNNING_ARCH} | Basic Setup | Launcher"
|
_TITLE="Archboot ${_RUNNING_ARCH} | Basic Setup | Launcher"
|
||||||
|
|
||||||
_show_login() {
|
|
||||||
[[ -e /.launcher-running ]] && rm /.launcher-running
|
|
||||||
clear
|
|
||||||
echo ""
|
|
||||||
agetty --show-issue
|
|
||||||
echo ""
|
|
||||||
cat /etc/motd
|
|
||||||
}
|
|
||||||
|
|
||||||
_check_desktop() {
|
_check_desktop() {
|
||||||
_DESKTOP=()
|
_DESKTOP=()
|
||||||
update | grep -q Gnome && _DESKTOP+=( "GNOME" "Simple Beautiful Elegant" )
|
update | grep -q Gnome && _DESKTOP+=( "GNOME" "Simple Beautiful Elegant" )
|
||||||
|
|
|
@ -21,6 +21,15 @@ _dialog() {
|
||||||
return $?
|
return $?
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_show_login() {
|
||||||
|
[[ -e "/.${_ANSWER}-running" ]] && rm "/.${_ANSWER}-running"
|
||||||
|
clear
|
||||||
|
echo ""
|
||||||
|
agetty --show-issue
|
||||||
|
echo ""
|
||||||
|
cat /etc/motd
|
||||||
|
}
|
||||||
|
|
||||||
_abort() {
|
_abort() {
|
||||||
if _dialog --yesno "Abort$(echo ${_TITLE} | cut -d '|' -f3) ?" 5 45; then
|
if _dialog --yesno "Abort$(echo ${_TITLE} | cut -d '|' -f3) ?" 5 45; then
|
||||||
[[ -e "${_ANSWER}-running" ]] && rm "${_ANSWER}-running"
|
[[ -e "${_ANSWER}-running" ]] && rm "${_ANSWER}-running"
|
||||||
|
|
|
@ -206,7 +206,7 @@ if [[ -e /usr/bin/setup ]]; then
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
# run launcher on latest/normal medium once!
|
# run launcher on latest/normal medium once!
|
||||||
if [[ ! -e /tmp/.launcher ]]; then
|
if [[ ! -e /.launcher ]]; then
|
||||||
launcher
|
launcher
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue