From: Michael Tremer Date: Mon, 29 Oct 2018 10:51:00 +0000 (+0000) Subject: Merge branch 'toolchain' into next X-Git-Tag: v2.21-core125~41 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=65ff71dc06504f7b4508865f70e327163a71d5e5;hp=9040a476ccbcb194178b5251ad53951ccb4becdf Merge branch 'toolchain' into next --- diff --git a/config/rootfiles/core/125/filelists/files b/config/rootfiles/core/125/filelists/files index 207ff839f1..26ac36080a 100644 --- a/config/rootfiles/core/125/filelists/files +++ b/config/rootfiles/core/125/filelists/files @@ -3,4 +3,5 @@ etc/issue etc/ssh/sshd_config etc/sysctl.conf srv/web/ipfire/cgi-bin/credits.cgi +srv/web/ipfire/cgi-bin/pakfire.cgi var/ipfire/langs diff --git a/doc/language_issues.de b/doc/language_issues.de index d99efac748..e9ca045485 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -259,6 +259,7 @@ WARNING: translation string unused: fwdfw rules WARNING: translation string unused: fwdfw std network WARNING: translation string unused: fwdfw till WARNING: translation string unused: fwdfw time +WARNING: translation string unused: fwdfw useless rule WARNING: translation string unused: fwdfw xt access WARNING: translation string unused: fwhost Custom Host WARNING: translation string unused: fwhost Custom Network @@ -469,6 +470,7 @@ WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn engines WARNING: translation string unused: ovpn log +WARNING: translation string unused: ovpn mtu-disc WARNING: translation string unused: ovpn mtu-disc and mtu not 1500 WARNING: translation string unused: ovpn mtu-disc maybe WARNING: translation string unused: ovpn mtu-disc no @@ -494,6 +496,9 @@ WARNING: translation string unused: ovpnstatus log WARNING: translation string unused: ovpnsys log WARNING: translation string unused: package failed to install WARNING: translation string unused: pakfire core update auto +WARNING: translation string unused: pakfire health check +WARNING: translation string unused: pakfire register +WARNING: translation string unused: pakfire update daily WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key diff --git a/doc/language_issues.en b/doc/language_issues.en index 60b6cbb465..de3048a4c3 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -283,6 +283,7 @@ WARNING: translation string unused: fwdfw rules WARNING: translation string unused: fwdfw std network WARNING: translation string unused: fwdfw till WARNING: translation string unused: fwdfw time +WARNING: translation string unused: fwdfw useless rule WARNING: translation string unused: fwdfw xt access WARNING: translation string unused: fwhost Custom Host WARNING: translation string unused: fwhost Custom Network @@ -497,6 +498,7 @@ WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn engines WARNING: translation string unused: ovpn log +WARNING: translation string unused: ovpn mtu-disc WARNING: translation string unused: ovpn mtu-disc and mtu not 1500 WARNING: translation string unused: ovpn mtu-disc maybe WARNING: translation string unused: ovpn mtu-disc no @@ -521,6 +523,9 @@ WARNING: translation string unused: ovpnstatus log WARNING: translation string unused: ovpnsys log WARNING: translation string unused: package failed to install WARNING: translation string unused: pakfire core update auto +WARNING: translation string unused: pakfire health check +WARNING: translation string unused: pakfire register +WARNING: translation string unused: pakfire update daily WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key diff --git a/doc/language_issues.es b/doc/language_issues.es index a9bf73f69e..6a8acd6da8 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -421,6 +421,9 @@ WARNING: translation string unused: ovpnstatus log WARNING: translation string unused: ovpnsys log WARNING: translation string unused: package failed to install WARNING: translation string unused: pakfire core update auto +WARNING: translation string unused: pakfire health check +WARNING: translation string unused: pakfire register +WARNING: translation string unused: pakfire update daily WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key @@ -894,7 +897,6 @@ WARNING: untranslated string: fwdfw togglelog WARNING: untranslated string: fwdfw use nat WARNING: untranslated string: fwdfw use srcport WARNING: untranslated string: fwdfw use srv -WARNING: untranslated string: fwdfw useless rule WARNING: untranslated string: fwdfw warn1 WARNING: untranslated string: fwdfw wd_fri WARNING: untranslated string: fwdfw wd_mon @@ -1097,7 +1099,6 @@ WARNING: untranslated string: ovpn generating the root and host certificates WARNING: untranslated string: ovpn ha WARNING: untranslated string: ovpn hmac WARNING: untranslated string: ovpn mgmt in root range -WARNING: untranslated string: ovpn mtu-disc WARNING: untranslated string: ovpn no connections WARNING: untranslated string: ovpn port in root range WARNING: untranslated string: ovpn routes push diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 4aaf5d3fb0..271179cc69 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -430,6 +430,9 @@ WARNING: translation string unused: ovpnstatus log WARNING: translation string unused: ovpnsys log WARNING: translation string unused: package failed to install WARNING: translation string unused: pakfire core update auto +WARNING: translation string unused: pakfire health check +WARNING: translation string unused: pakfire register +WARNING: translation string unused: pakfire update daily WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key @@ -903,7 +906,6 @@ WARNING: untranslated string: fwdfw togglelog WARNING: untranslated string: fwdfw use nat WARNING: untranslated string: fwdfw use srcport WARNING: untranslated string: fwdfw use srv -WARNING: untranslated string: fwdfw useless rule WARNING: untranslated string: fwdfw warn1 WARNING: untranslated string: fwdfw wd_fri WARNING: untranslated string: fwdfw wd_mon @@ -1111,7 +1113,6 @@ WARNING: untranslated string: ovpn generating the root and host certificates WARNING: untranslated string: ovpn ha WARNING: untranslated string: ovpn hmac WARNING: untranslated string: ovpn mgmt in root range -WARNING: untranslated string: ovpn mtu-disc WARNING: untranslated string: ovpn no connections WARNING: untranslated string: ovpn port in root range WARNING: untranslated string: ovpn warning rfc3280 diff --git a/doc/language_issues.it b/doc/language_issues.it index 448c96bb14..ac51eb07c8 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -259,6 +259,7 @@ WARNING: translation string unused: fwdfw rules WARNING: translation string unused: fwdfw std network WARNING: translation string unused: fwdfw till WARNING: translation string unused: fwdfw time +WARNING: translation string unused: fwdfw useless rule WARNING: translation string unused: fwdfw xt access WARNING: translation string unused: fwhost Custom Host WARNING: translation string unused: fwhost Custom Network @@ -469,6 +470,7 @@ WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn engines WARNING: translation string unused: ovpn log +WARNING: translation string unused: ovpn mtu-disc WARNING: translation string unused: ovpn mtu-disc and mtu not 1500 WARNING: translation string unused: ovpn mtu-disc maybe WARNING: translation string unused: ovpn mtu-disc no @@ -493,6 +495,9 @@ WARNING: translation string unused: ovpnstatus log WARNING: translation string unused: ovpnsys log WARNING: translation string unused: package failed to install WARNING: translation string unused: pakfire core update auto +WARNING: translation string unused: pakfire health check +WARNING: translation string unused: pakfire register +WARNING: translation string unused: pakfire update daily WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key diff --git a/doc/language_issues.nl b/doc/language_issues.nl index a0216f0f7c..18307d5af8 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -258,6 +258,7 @@ WARNING: translation string unused: fwdfw rules WARNING: translation string unused: fwdfw std network WARNING: translation string unused: fwdfw till WARNING: translation string unused: fwdfw time +WARNING: translation string unused: fwdfw useless rule WARNING: translation string unused: fwdfw xt access WARNING: translation string unused: fwhost Custom Host WARNING: translation string unused: fwhost Custom Network @@ -466,6 +467,7 @@ WARNING: translation string unused: ovpn config WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn log +WARNING: translation string unused: ovpn mtu-disc WARNING: translation string unused: ovpn mtu-disc and mtu not 1500 WARNING: translation string unused: ovpn mtu-disc maybe WARNING: translation string unused: ovpn mtu-disc no @@ -490,6 +492,9 @@ WARNING: translation string unused: ovpnstatus log WARNING: translation string unused: ovpnsys log WARNING: translation string unused: package failed to install WARNING: translation string unused: pakfire core update auto +WARNING: translation string unused: pakfire health check +WARNING: translation string unused: pakfire register +WARNING: translation string unused: pakfire update daily WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key diff --git a/doc/language_issues.pl b/doc/language_issues.pl index a9bf73f69e..6a8acd6da8 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -421,6 +421,9 @@ WARNING: translation string unused: ovpnstatus log WARNING: translation string unused: ovpnsys log WARNING: translation string unused: package failed to install WARNING: translation string unused: pakfire core update auto +WARNING: translation string unused: pakfire health check +WARNING: translation string unused: pakfire register +WARNING: translation string unused: pakfire update daily WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key @@ -894,7 +897,6 @@ WARNING: untranslated string: fwdfw togglelog WARNING: untranslated string: fwdfw use nat WARNING: untranslated string: fwdfw use srcport WARNING: untranslated string: fwdfw use srv -WARNING: untranslated string: fwdfw useless rule WARNING: untranslated string: fwdfw warn1 WARNING: untranslated string: fwdfw wd_fri WARNING: untranslated string: fwdfw wd_mon @@ -1097,7 +1099,6 @@ WARNING: untranslated string: ovpn generating the root and host certificates WARNING: untranslated string: ovpn ha WARNING: untranslated string: ovpn hmac WARNING: untranslated string: ovpn mgmt in root range -WARNING: untranslated string: ovpn mtu-disc WARNING: untranslated string: ovpn no connections WARNING: untranslated string: ovpn port in root range WARNING: untranslated string: ovpn routes push diff --git a/doc/language_issues.ru b/doc/language_issues.ru index cbcaca1ec8..3a7b6b95fb 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -424,6 +424,9 @@ WARNING: translation string unused: ovpnstatus log WARNING: translation string unused: ovpnsys log WARNING: translation string unused: package failed to install WARNING: translation string unused: pakfire core update auto +WARNING: translation string unused: pakfire health check +WARNING: translation string unused: pakfire register +WARNING: translation string unused: pakfire update daily WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key @@ -888,7 +891,6 @@ WARNING: untranslated string: fwdfw togglelog WARNING: untranslated string: fwdfw use nat WARNING: untranslated string: fwdfw use srcport WARNING: untranslated string: fwdfw use srv -WARNING: untranslated string: fwdfw useless rule WARNING: untranslated string: fwdfw warn1 WARNING: untranslated string: fwdfw wd_fri WARNING: untranslated string: fwdfw wd_mon @@ -1096,7 +1098,6 @@ WARNING: untranslated string: ovpn generating the root and host certificates WARNING: untranslated string: ovpn ha WARNING: untranslated string: ovpn hmac WARNING: untranslated string: ovpn mgmt in root range -WARNING: untranslated string: ovpn mtu-disc WARNING: untranslated string: ovpn no connections WARNING: untranslated string: ovpn port in root range WARNING: untranslated string: ovpn warning rfc3280 diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 8a7ca44c17..7b5bc05591 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -283,6 +283,7 @@ WARNING: translation string unused: fwdfw rules WARNING: translation string unused: fwdfw std network WARNING: translation string unused: fwdfw till WARNING: translation string unused: fwdfw time +WARNING: translation string unused: fwdfw useless rule WARNING: translation string unused: fwdfw xt access WARNING: translation string unused: fwhost Custom Host WARNING: translation string unused: fwhost Custom Network @@ -497,6 +498,7 @@ WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn engines WARNING: translation string unused: ovpn log +WARNING: translation string unused: ovpn mtu-disc WARNING: translation string unused: ovpn mtu-disc and mtu not 1500 WARNING: translation string unused: ovpn mtu-disc maybe WARNING: translation string unused: ovpn mtu-disc no @@ -521,6 +523,9 @@ WARNING: translation string unused: ovpnstatus log WARNING: translation string unused: ovpnsys log WARNING: translation string unused: package failed to install WARNING: translation string unused: pakfire core update auto +WARNING: translation string unused: pakfire health check +WARNING: translation string unused: pakfire register +WARNING: translation string unused: pakfire update daily WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi index 79ff636c80..e6f3cda94a 100644 --- a/html/cgi-bin/pakfire.cgi +++ b/html/cgi-bin/pakfire.cgi @@ -278,20 +278,6 @@ print < END -&Header::closebox(); -&Header::openbox("100%", "center", "$Lang::tr{'settings'}"); - -print < - - - -
$Lang::tr{'basic options'}
$Lang::tr{'pakfire update daily'} - on | - off
- -END - &Header::closebox(); &Header::closebigbox(); &Header::closepage(); diff --git a/src/installer/hw.c b/src/installer/hw.c index 8189aba18c..b329db545b 100644 --- a/src/installer/hw.c +++ b/src/installer/hw.c @@ -706,7 +706,6 @@ int hw_create_partitions(struct hw_destination* dest, const char* output) { if (*dest->part_bootldr) { asprintf(&cmd, "%s set %d bios_grub on", cmd, dest->part_boot_idx); } - asprintf(&cmd, "%s disk_set pmbr_boot on", cmd); } r = mysystem(output, cmd);