This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, master has been updated via e238e4c25bed0fd876d12671518957d13d1a0426 (commit) from ceb5098e575cd68a133e238c1ec8f67867bf41a7 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit e238e4c25bed0fd876d12671518957d13d1a0426 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Dec 24 01:02:57 2010 +0100
firstsetup: add reboot if setup was not finnished.
-----------------------------------------------------------------------
Summary of changes: src/initscripts/init.d/firstsetup | 4 ++++ src/install+setup/setup/main.c | 10 ++++++++++ 2 files changed, 14 insertions(+), 0 deletions(-) mode change 100755 => 100644 src/initscripts/init.d/openvmtools
Difference in files: diff --git a/src/initscripts/init.d/firstsetup b/src/initscripts/init.d/firstsetup index b03b729..8ea1b5e 100644 --- a/src/initscripts/init.d/firstsetup +++ b/src/initscripts/init.d/firstsetup @@ -2,6 +2,10 @@ /etc/init.d/sysklogd start export LANG=en_US.utf8 /usr/local/sbin/setup /dev/tty2 INSTALL +if [ "${?}" == "1" ]; then + echo Setup not finished. Rebooting ... + reboot -f +fi echo Restarting udev... killall udevd /sbin/udevd --daemon diff --git a/src/initscripts/init.d/openvmtools b/src/initscripts/init.d/openvmtools old mode 100755 new mode 100644 diff --git a/src/install+setup/setup/main.c b/src/install+setup/setup/main.c index 33cae34..a14930d 100644 --- a/src/install+setup/setup/main.c +++ b/src/install+setup/setup/main.c @@ -199,7 +199,17 @@ EXIT: if (autook) newtWinMessage(title, ctr[TR_OK], ctr[TR_SETUP_FINISHED]); else + { newtWinMessage(ctr[TR_WARNING], ctr[TR_OK], ctr[TR_SETUP_NOT_COMPLETE]); + + fprintf(flog, "Setup program not finnished.\n"); + fflush(flog); + fclose(flog); + + newtFinished(); + + return 1; + } }
fprintf(flog, "Setup program ended.\n");
hooks/post-receive -- IPFire 2.x development tree