firstsetup: add reboot if setup was not finnished.

diff --git a/src/initscripts/init.d/firstsetup b/src/initscripts/init.d/firstsetup
index b03b72929a8e799712ff596a89ec158ad81db8f6..8ea1b5ec97f5fa0b3738634ef7fe5e962edfd383 100644 (file)
--- 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 (executable)
new mode 100644 (file)

diff --git a/src/install+setup/setup/main.c b/src/install+setup/setup/main.c
index 33cae349e7936389177db188f08d191a98c317a3..a14930d85e749afe403eb710f60d207859abaf10 100644 (file)
--- 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");