root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-19 19:40:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

'added correct exit status in abort mode in km and tz'

Browse source
This commit is contained in:
Tobias Powalowski 2009-02-02 23:08:02 +01:00
parent c7367c81b5
commit 7a7cb41dc8
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
usr/share/archboot/installer/setup
View file

@ -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()

2
usr/share/archboot/keymap/km
View file

@ -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()

2
usr/share/archboot/tz/tz
View file

@ -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()