webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-26 10:52:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

installer: Fix showing COPYING.

Browse Source
This commit is contained in:
Michael Tremer
2012-08-29 21:29:29 +02:00
parent daa1e380d5
commit 918546e24f
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/install+setup/install/main.c
View File

@@ -14,6 +14,7 @@
#define INST_FILECOUNT 10700
#define UNATTENDED_CONF "/cdrom/boot/unattended.conf"
#define LICENSE_FILE "/cdrom/COPYING"
#define EXT2 0
#define EXT3 1
@@ -120,16 +121,6 @@ int main(int argc, char *argv[])
}
}
// Read gpl ...
if (! (copying = fopen("/COPYING", "r")))
{
fprintf(flog, "Couldn't open gpl (/COPYING)\n");
sprintf(discl_msg, "Couldn't open gpl (/COPYING)\n");
} else {
fread(discl_msg, 1, 40000, copying);
fclose(copying);
}
// Load common modules
mysystem("/sbin/modprobe iso9660"); // CDROM
// mysystem("/sbin/modprobe ext2"); // Boot patition
@@ -157,11 +148,6 @@ int main(int argc, char *argv[])
if (!unattended) {
sprintf(message, ctr[TR_WELCOME], NAME);
newtWinMessage(title, ctr[TR_OK], message);
if (disclaimerbox(discl_msg)==0) {
errorbox(ctr[TR_LICENSE_NOT_ACCEPTED]);
goto EXIT;
}
}
mysystem("/bin/mountsource.sh");
@@ -178,7 +164,23 @@ int main(int argc, char *argv[])
fgets(sourcedrive, 5, handle);
fprintf(flog, "Source drive: %s\n", sourcedrive);
fclose(handle);
if (!unattended) {
// Read the license file.
if (!(copying = fopen(LICENSE_FILE, "r"))) {
sprintf(discl_msg, "Could not open license file: %s\n", LICENSE_FILE);
fprintf(flog, discl_msg);
} else {
fread(discl_msg, 1, 40000, copying);
fclose(copying);
if (disclaimerbox(discl_msg)==0) {
errorbox(ctr[TR_LICENSE_NOT_ACCEPTED]);
goto EXIT;
}
}
}
i = 0;
while (found == 0) {
i++;