From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 16 Mar 2015 15:10:03 +0000 (+0100)
Subject: installer: Don't accept the license in unattended mode
X-Git-Tag: v2.17-core91~154^2~3^2~14
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=53103ab55c63eda3cd302c9b8af743429b62726c;hp=-c

installer: Don't accept the license in unattended mode
---

53103ab55c63eda3cd302c9b8af743429b62726c
diff --git a/src/installer/main.c b/src/installer/main.c
index 358b2c46ff..75c8c5ae0b 100644
--- a/src/installer/main.c
+++ b/src/installer/main.c
@@ -833,8 +833,11 @@ int main(int argc, char *argv[]) {
 
 	newtPopWindow();
 
-	/* Set marker that the user has already accepted the gpl */
-	mysystem(logfile, "/usr/bin/touch /harddisk/var/ipfire/main/gpl_accepted");
+	/* Set marker that the user has already accepted the GPL if the license has been shown
+	 * in the installation process. In unatteded mode, the user will be presented the
+	 * license when he or she logs on to the web user interface for the first time. */
+	if (!config.unattended)
+		mysystem(logfile, "/usr/bin/touch /harddisk/var/ipfire/main/gpl_accepted");
 
 	/* Copy restore file from cdrom */
 	char* backup_file = hw_find_backup_file(logfile, SOURCE_MOUNT_PATH);