From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 24 Dec 2010 00:02:57 +0000 (+0100)
Subject: firstsetup: add reboot if setup was not finnished.
X-Git-Tag: v2.9-rc1~39
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e238e4c25bed0fd876d12671518957d13d1a0426;p=people%2Fpmueller%2Fipfire-2.x.git

firstsetup: add reboot if setup was not finnished.
---

diff --git a/src/initscripts/init.d/firstsetup b/src/initscripts/init.d/firstsetup
index b03b72929a..8ea1b5ec97 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 33cae349e7..a14930d85e 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");