mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-19 19:40:37 +02:00
'added correct exit status in abort mode in km and tz'
This commit is contained in:
parent
c7367c81b5
commit
7a7cb41dc8
3 changed files with 4 additions and 6 deletions
|
@ -1556,21 +1556,19 @@ select_source()
|
||||||
set_clock()
|
set_clock()
|
||||||
{
|
{
|
||||||
if [ -e /usr/bin/tz ]; then
|
if [ -e /usr/bin/tz ]; then
|
||||||
tz --setup
|
tz --setup && NEXTITEM="2"
|
||||||
else
|
else
|
||||||
DIALOG --msgbox "Error:\ntz script not found, aborting clock setting" 0 0
|
DIALOG --msgbox "Error:\ntz script not found, aborting clock setting" 0 0
|
||||||
fi
|
fi
|
||||||
NEXTITEM="2"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
set_keyboard()
|
set_keyboard()
|
||||||
{
|
{
|
||||||
if [ -e /usr/bin/km ]; then
|
if [ -e /usr/bin/km ]; then
|
||||||
km --setup
|
km --setup && NEXTITEM="1"
|
||||||
else
|
else
|
||||||
DIALOG --msgbox "Error:\nkm script not found, aborting keyboard and console setting" 0 0
|
DIALOG --msgbox "Error:\nkm script not found, aborting keyboard and console setting" 0 0
|
||||||
fi
|
fi
|
||||||
NEXTITEM="1"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# run_mkinitcpio()
|
# run_mkinitcpio()
|
||||||
|
|
|
@ -19,7 +19,7 @@ abort()
|
||||||
[ -e /tmp/.font ] && rm -f /tmp/.font
|
[ -e /tmp/.font ] && rm -f /tmp/.font
|
||||||
[ -e /tmp/.km-running ] && rm /tmp/.km-running
|
[ -e /tmp/.km-running ] && rm /tmp/.km-running
|
||||||
clear
|
clear
|
||||||
exit 0
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
# DIALOG()
|
# DIALOG()
|
||||||
|
|
|
@ -21,7 +21,7 @@ abort()
|
||||||
[ -e /var/lib/hwclock/adjtime ] && rm -f /var/lib/hwclock/adjtime
|
[ -e /var/lib/hwclock/adjtime ] && rm -f /var/lib/hwclock/adjtime
|
||||||
[ -e /tmp/.tz-running ] && rm /tmp/.tz-running
|
[ -e /tmp/.tz-running ] && rm /tmp/.tz-running
|
||||||
clear
|
clear
|
||||||
exit 0
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
# DIALOG()
|
# DIALOG()
|
||||||
|
|
Loading…
Reference in a new issue