Skip to content

Commit

Permalink
execute more code for fai-diskimage and dirinstall
Browse files Browse the repository at this point in the history
what about softupdate?
  • Loading branch information
Thomas Lange committed Aug 14, 2017
1 parent 4709ef6 commit 068d763
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions lib/subroutines
Expand Up @@ -544,18 +544,15 @@ task_savelog() {
task_faiend() {

local dir cdromdevice
[ $do_init_tasks -eq 0 ] && return 0
wait_for_jobs
: ${flag_reboot:=0}
: ${flag_halt:=0}

# reboot/halt without prompting if FAI_FLAG reboot or halt is set
# wait for keypress if neither flag reboot nor halt is set
if [ "$flag_reboot" -eq 0 -a "$flag_halt" -eq 0 ]; then
if [ $do_init_tasks -eq 1 -a "$flag_reboot" -eq 0 -a "$flag_halt" -eq 0 ]; then
echo "Press <RETURN> to reboot (do not remove your removable medium yet)."
read
else
sleep 10
fi

sendmon "TASKEND faiend 0"
Expand All @@ -576,6 +573,7 @@ task_faiend() {
done
fi

[ $do_init_tasks -eq 0 ] && return 0
killall -q sshd udevd rsyslogd
umount $FAI_ROOT/proc $FAI_ROOT/sys $FAI_ROOT/dev/pts 2>/dev/null
umount -arf 2>/dev/null
Expand Down

0 comments on commit 068d763

Please sign in to comment.