webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

installer: Pretify the interface a little bit

Browse Source
This commit is contained in:
Michael Tremer
2014-08-14 15:19:42 +02:00
parent d04d4d586b
commit ae5edf1612
2 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lfs/installer
View File

@@ -30,6 +30,8 @@ THISAPP = installer
DIR_APP = $(DIR_SRC)/$(THISAPP) DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP)
SLOGAN = An Open Source Firewall Solution
############################################################################### ###############################################################################
# Top-level Rules # Top-level Rules
############################################################################### ###############################################################################

31
src/installer/main.c
View File

@@ -274,7 +274,7 @@ int main(int argc, char *argv[]) {
char* roottext = center_string(system_release, screen_cols); char* roottext = center_string(system_release, screen_cols);
newtDrawRootText(0, 0, roottext); newtDrawRootText(0, 0, roottext);
sprintf (title, "%s %s - %s", NAME, VERSION, SLOGAN); snprintf(title, sizeof(title), "%s - %s", NAME, SLOGAN);
if (! (cmdfile = fopen("/proc/cmdline", "r"))) if (! (cmdfile = fopen("/proc/cmdline", "r")))
{ {
@@ -325,7 +325,7 @@ int main(int argc, char *argv[]) {
if (!unattended) { if (!unattended) {
snprintf(message, sizeof(message), snprintf(message, sizeof(message),
_("Welcome to the %s installation program. " _("Welcome to the %s installation program.\n\n"
"Selecting Cancel on any of the following screens will reboot the computer."), NAME); "Selecting Cancel on any of the following screens will reboot the computer."), NAME);
newtWinMessage(title, _("Start installation"), message); newtWinMessage(title, _("Start installation"), message);
} }
@@ -373,7 +373,7 @@ int main(int argc, char *argv[]) {
fread(discl_msg, 1, 40000, copying); fread(discl_msg, 1, 40000, copying);
fclose(copying); fclose(copying);
if (newtLicenseBox(title, discl_msg, 75, 20)) { if (newtLicenseBox(_("License Agreement"), discl_msg, 75, 20)) {
errorbox(_("License not accepted!")); errorbox(_("License not accepted!"));
goto EXIT; goto EXIT;
@@ -491,7 +491,7 @@ int main(int argc, char *argv[]) {
// Warn the user if there is not enough space to create a swap partition // Warn the user if there is not enough space to create a swap partition
if (!unattended && !*destination->part_swap) { if (!unattended && !*destination->part_swap) {
rc = newtWinChoice(title, _("OK"), _("Cancel"), rc = newtWinChoice(title, _("OK"), _("Cancel"),
_("Your harddisk is very small, but you can continue with an very small swap. (Use with caution).")); _("Your harddisk is very small, but you can continue without a swap partition."));
if (rc != 1) if (rc != 1)
goto EXIT; goto EXIT;
@@ -644,12 +644,12 @@ int main(int argc, char *argv[]) {
mysystem(logfile, commandstring); mysystem(logfile, commandstring);
if (!unattended) { if (!unattended) {
snprintf(message, sizeof(message), _("%s was successfully installed. " snprintf(message, sizeof(message), _(
"Please remove any installation mediums from this system. " "%s was successfully installed!\n\n"
"Setup will now run where you may configure networking and the system passwords. " "Please remove any installation mediums from this system and hit the reboot button. "
"After Setup has been completed, you should point your web browser at https://%s:444 " "Once the system has restarted you will be asked to setup networking and system passwords. "
"(or whatever you name your %s), and configure dialup networking (if required) and " "After that, you should point your web browser at https://%s:444 (or what ever you name "
"remote access."), NAME, SNAME, NAME); "your %s) for the web configuration console."), NAME, SNAME, NAME);
newtWinMessage(_("Congratulations!"), _("Reboot"), message); newtWinMessage(_("Congratulations!"), _("Reboot"), message);
} }
@@ -657,14 +657,11 @@ int main(int argc, char *argv[]) {
EXIT: EXIT:
fprintf(flog, "Install program ended.\n"); fprintf(flog, "Install program ended.\n");
fflush(flog);
fclose(flog);
if (!(allok)) if (!allok)
newtWinMessage(title, _("OK"), _("Press Ok to reboot.")); newtWinMessage(title, _("OK"), _("Setup has failed. Press Ok to reboot."));
if (allok) {
fflush(flog);
fclose(flog);
}
newtFinished(); newtFinished();